aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--TODO1
m---------scintilla0
-rw-r--r--src/goto.h2
-rw-r--r--src/main.cpp2
-rw-r--r--src/parser.cpp2
-rw-r--r--src/parser.h2
-rw-r--r--src/qregisters.cpp2
-rw-r--r--src/qregisters.h2
-rw-r--r--src/search.h6
-rw-r--r--src/spawn.cpp2
10 files changed, 10 insertions, 11 deletions
diff --git a/TODO b/TODO
index 67b8f77..af0f5db 100644
--- a/TODO
+++ b/TODO
@@ -4,7 +4,6 @@ Known Bugs:
* Null-byte in strings not always handled transparently
* saving another user's file will only preserve the user when run as root
(WON'T FIX!?)
- * Scintilla/Scinterm: sometimes <TAB> indents too much (see e.g. state declarations)
* crashes on large files: S^EM^X$ (regexp: .*)
* m,nX crashes if m > n
diff --git a/scintilla b/scintilla
-Subproject 7ee0f45178da25c2746ca1d065653a0b6a27078
+Subproject a65c538fcfecafcefed34078e7671bc4ea6ed1e
diff --git a/src/goto.h b/src/goto.h
index e27c467..1988e23 100644
--- a/src/goto.h
+++ b/src/goto.h
@@ -119,7 +119,7 @@ private:
};
namespace States {
- extern StateLabel label;
+ extern StateLabel label;
extern StateGotoCmd gotocmd;
}
diff --git a/src/main.cpp b/src/main.cpp
index b544d8e..d7b9cc0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -83,7 +83,7 @@ static void sigint_handler(int signal);
void
String::get_coord(const gchar *str, gint pos,
- gint &line, gint &column)
+ gint &line, gint &column)
{
line = column = 1;
diff --git a/src/parser.cpp b/src/parser.cpp
index fe79f69..e5d1f22 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -48,7 +48,7 @@ namespace SciTECO {
gint macro_pc = 0;
namespace States {
- StateStart start;
+ StateStart start;
StateControl control;
StateASCII ascii;
StateFCommand fcommand;
diff --git a/src/parser.h b/src/parser.h
index b56b7d4..4092435 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -249,7 +249,7 @@ protected:
};
namespace States {
- extern StateStart start;
+ extern StateStart start;
extern StateControl control;
extern StateASCII ascii;
extern StateFCommand fcommand;
diff --git a/src/qregisters.cpp b/src/qregisters.cpp
index 3a70205..64d80e8 100644
--- a/src/qregisters.cpp
+++ b/src/qregisters.cpp
@@ -47,7 +47,7 @@ namespace States {
StateLoadQReg loadqreg;
StateEPctCommand epctcommand;
StateSaveQReg saveqreg;
- StateQueryQReg queryqreg;
+ StateQueryQReg queryqreg;
StateCtlUCommand ctlucommand;
StateEUCommand eucommand;
StateSetQRegString setqregstring_nobuilding(false);
diff --git a/src/qregisters.h b/src/qregisters.h
index 257b3b7..62a9521 100644
--- a/src/qregisters.h
+++ b/src/qregisters.h
@@ -448,7 +448,7 @@ namespace States {
extern StatePopQReg popqreg;
extern StateEQCommand eqcommand;
extern StateLoadQReg loadqreg;
- extern StateEPctCommand epctcommand;
+ extern StateEPctCommand epctcommand;
extern StateSaveQReg saveqreg;
extern StateQueryQReg queryqreg;
extern StateCtlUCommand ctlucommand;
diff --git a/src/search.h b/src/search.h
index 9dec168..b885ad4 100644
--- a/src/search.h
+++ b/src/search.h
@@ -124,15 +124,15 @@ namespace States {
extern StateSearch search;
extern StateSearchAll searchall;
extern StateSearchKill searchkill;
- extern StateSearchDelete searchdelete;
+ extern StateSearchDelete searchdelete;
extern StateReplace replace;
extern StateReplace_insert replace_insert;
extern StateReplace_ignore replace_ignore;
extern StateReplaceDefault replacedefault;
- extern StateReplaceDefault_insert replacedefault_insert;
- extern StateReplaceDefault_ignore replacedefault_ignore;
+ extern StateReplaceDefault_insert replacedefault_insert;
+ extern StateReplaceDefault_ignore replacedefault_ignore;
}
} /* namespace SciTECO */
diff --git a/src/spawn.cpp b/src/spawn.cpp
index 74c73d1..8c2e05f 100644
--- a/src/spawn.cpp
+++ b/src/spawn.cpp
@@ -76,7 +76,7 @@ namespace SciTECO {
namespace States {
StateExecuteCommand executecommand;
- StateEGCommand egcommand;
+ StateEGCommand egcommand;
}
extern "C" {