removed most exception specifications: allow bad_allocs to propagate

 * specifications resulted in runtime errors (unexpected exception) when bad_alloc ocurred
 * specs should be used scarcely: only when the errors that may be thrown are all known
   and for documentary purposes

12 files changed, 110 insertions, 111 deletions

diff --git a/src/cmdline.cpp b/src/cmdline.cpp
index 641b062..32f0481 100644
--- a/src/cmdline.cpp
+++ b/src/cmdline.cpp
@@ -481,7 +481,7 @@ symbol_complete(SymbolList &list, const gchar *symbol, gchar completed)
  * Q-Register <q>.
  */
 State *
-StateSaveCmdline::got_register(QRegister &reg) throw (Error)
+StateSaveCmdline::got_register(QRegister &reg)
 {
 	BEGIN_EXEC(&States::start);
 
diff --git a/src/cmdline.h b/src/cmdline.h
index eaf522d..c078ff1 100644
--- a/src/cmdline.h
+++ b/src/cmdline.h
@@ -49,7 +49,7 @@ public:
 	StateSaveCmdline() : StateExpectQReg(true) {}
 
 private:
-	State *got_register(QRegister &reg) throw (Error);
+	State *got_register(QRegister &reg);
 };
 
 namespace States {
diff --git a/src/goto.cpp b/src/goto.cpp
index 4996122..d0b2dab 100644
--- a/src/goto.cpp
+++ b/src/goto.cpp
@@ -116,7 +116,7 @@ StateLabel::StateLabel() : State()
 }
 
 State *
-StateLabel::custom(gchar chr) throw (Error)
+StateLabel::custom(gchar chr)
 {
 	if (chr == '!') {
 		Goto::table->undo_set(strings[0],
@@ -166,7 +166,7 @@ StateLabel::custom(gchar chr) throw (Error)
  * terminate the command-line.
  */
 State *
-StateGotoCmd::done(const gchar *str) throw (Error)
+StateGotoCmd::done(const gchar *str)
 {
 	tecoInt value;
 	gchar **labels;
diff --git a/src/goto.h b/src/goto.h
index c95c993..b5d3a7f 100644
--- a/src/goto.h
+++ b/src/goto.h
@@ -108,12 +108,12 @@ public:
 	StateLabel();
 
 private:
-	State *custom(gchar chr) throw (Error);
+	State *custom(gchar chr);
 };
 
 class StateGotoCmd : public StateExpectString {
 private:
-	State *done(const gchar *str) throw (Error);
+	State *done(const gchar *str);
 };
 
 namespace States {
diff --git a/src/parser.cpp b/src/parser.cpp
index f64b246..67d8b73 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -270,7 +270,7 @@ State::eval_colon(void)
 }
 
 void
-State::input(gchar chr) throw (Error, ReplaceCmdline)
+State::input(gchar chr)
 {
 	State *state = States::current;
 
@@ -291,7 +291,7 @@ State::input(gchar chr) throw (Error, ReplaceCmdline)
 }
 
 State *
-State::get_next_state(gchar chr) throw (Error, ReplaceCmdline)
+State::get_next_state(gchar chr)
 {
 	State *next = NULL;
 	guint upper = g_ascii_toupper(chr);
@@ -316,7 +316,7 @@ StringBuildingMachine::reset(void)
 }
 
 gchar *
-StringBuildingMachine::input(gchar chr) throw (State::Error)
+StringBuildingMachine::input(gchar chr)
 {
 	QRegister *reg;
 
@@ -431,7 +431,7 @@ StringBuildingMachine::~StringBuildingMachine()
 }
 
 State *
-StateExpectString::custom(gchar chr) throw (Error, ReplaceCmdline)
+StateExpectString::custom(gchar chr)
 {
 	gchar *insert;
 
@@ -657,7 +657,7 @@ StateStart::delete_words(tecoInt n)
 }
 
 State *
-StateStart::custom(gchar chr) throw (Error, ReplaceCmdline)
+StateStart::custom(gchar chr)
 {
 	tecoInt v;
 	tecoBool rc;
@@ -1437,7 +1437,7 @@ StateFCommand::StateFCommand() : State()
 }
 
 State *
-StateFCommand::custom(gchar chr) throw (Error)
+StateFCommand::custom(gchar chr)
 {
 	switch (chr) {
 	/*
@@ -1539,7 +1539,7 @@ StateCondCommand::StateCondCommand() : State()
 }
 
 State *
-StateCondCommand::custom(gchar chr) throw (Error)
+StateCondCommand::custom(gchar chr)
 {
 	tecoInt value = 0;
 	bool result;
@@ -1632,7 +1632,7 @@ StateControl::StateControl() : State()
 }
 
 State *
-StateControl::custom(gchar chr) throw (Error)
+StateControl::custom(gchar chr)
 {
 	switch (g_ascii_toupper(chr)) {
 	/*$
@@ -1762,7 +1762,7 @@ StateASCII::StateASCII() : State()
 }
 
 State *
-StateASCII::custom(gchar chr) throw (Error)
+StateASCII::custom(gchar chr)
 {
 	BEGIN_EXEC(&States::start);
 
@@ -1782,7 +1782,7 @@ StateECommand::StateECommand() : State()
 }
 
 State *
-StateECommand::custom(gchar chr) throw (Error)
+StateECommand::custom(gchar chr)
 {
 	switch (g_ascii_toupper(chr)) {
 	/*$
@@ -1954,7 +1954,7 @@ static struct ScintillaMessage {
  *     removes the buffer from the ring again.
  */
 State *
-StateScintilla_symbols::done(const gchar *str) throw (Error)
+StateScintilla_symbols::done(const gchar *str)
 {
 	BEGIN_EXEC(&States::scintilla_lparam);
 
@@ -2011,7 +2011,7 @@ cleanup:
 }
 
 State *
-StateScintilla_lParam::done(const gchar *str) throw (Error)
+StateScintilla_lParam::done(const gchar *str)
 {
 	BEGIN_EXEC(&States::start);
 
@@ -2048,7 +2048,7 @@ StateScintilla_lParam::done(const gchar *str) throw (Error)
  * I command.
  */
 void
-StateInsert::initial(void) throw (Error)
+StateInsert::initial(void)
 {
 	int args;
 
@@ -2072,7 +2072,7 @@ StateInsert::initial(void) throw (Error)
 }
 
 void
-StateInsert::process(const gchar *str, gint new_chars) throw (Error)
+StateInsert::process(const gchar *str, gint new_chars)
 {
 	interface.ssm(SCI_BEGINUNDOACTION);
 	interface.ssm(SCI_ADDTEXT, new_chars,
@@ -2085,7 +2085,7 @@ StateInsert::process(const gchar *str, gint new_chars) throw (Error)
 }
 
 State *
-StateInsert::done(const gchar *str) throw (Error)
+StateInsert::done(const gchar *str)
 {
 	/* nothing to be done when done */
 	return &States::start;
diff --git a/src/parser.h b/src/parser.h
index a829b6d..76cd7c7 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -171,14 +171,14 @@ protected:
 public:
 	State();
 
-	static void input(gchar chr) throw (Error, ReplaceCmdline);
-	State *get_next_state(gchar chr) throw (Error, ReplaceCmdline);
+	static void input(gchar chr);
+	State *get_next_state(gchar chr);
 
 protected:
 	static bool eval_colon(void);
 
 	virtual State *
-	custom(gchar chr) throw (Error, ReplaceCmdline)
+	custom(gchar chr)
 	{
 		throw SyntaxError(chr);
 		return NULL;
@@ -221,7 +221,7 @@ public:
 		set(StateStart);
 	}
 
-	virtual Type input(gchar chr) throw (State::Error) = 0;
+	virtual Type input(gchar chr) = 0;
 };
 
 /* avoid circular dependency on qregisters.h */
@@ -246,7 +246,7 @@ public:
 
 	void reset(void);
 
-	gchar *input(gchar chr) throw (State::Error);
+	gchar *input(gchar chr);
 };
 
 /*
@@ -268,12 +268,12 @@ public:
 			   string_building(_building), last(_last) {}
 
 private:
-	State *custom(gchar chr) throw (Error, ReplaceCmdline);
+	State *custom(gchar chr);
 
 protected:
-	virtual void initial(void) throw (Error) {}
-	virtual void process(const gchar *str, gint new_chars) throw (Error) {}
-	virtual State *done(const gchar *str) throw (Error, ReplaceCmdline) = 0;
+	virtual void initial(void) {}
+	virtual void process(const gchar *str, gint new_chars) {}
+	virtual State *done(const gchar *str) = 0;
 };
 
 class StateExpectFile : public StateExpectString {
@@ -295,7 +295,7 @@ private:
 
 	tecoBool delete_words(tecoInt n);
 
-	State *custom(gchar chr) throw (Error, ReplaceCmdline);
+	State *custom(gchar chr);
 };
 
 class StateControl : public State {
@@ -303,7 +303,7 @@ public:
 	StateControl();
 
 private:
-	State *custom(gchar chr) throw (Error);
+	State *custom(gchar chr);
 };
 
 class StateASCII : public State {
@@ -311,7 +311,7 @@ public:
 	StateASCII();
 
 private:
-	State *custom(gchar chr) throw (Error);
+	State *custom(gchar chr);
 };
 
 class StateFCommand : public State {
@@ -319,7 +319,7 @@ public:
 	StateFCommand();
 
 private:
-	State *custom(gchar chr) throw (Error);
+	State *custom(gchar chr);
 };
 
 class StateCondCommand : public State {
@@ -327,7 +327,7 @@ public:
 	StateCondCommand();
 
 private:
-	State *custom(gchar chr) throw (Error);
+	State *custom(gchar chr);
 };
 
 class StateECommand : public State {
@@ -335,7 +335,7 @@ public:
 	StateECommand();
 
 private:
-	State *custom(gchar chr) throw (Error);
+	State *custom(gchar chr);
 };
 
 class StateScintilla_symbols : public StateExpectString {
@@ -343,12 +343,12 @@ public:
 	StateScintilla_symbols() : StateExpectString(true, false) {}
 
 private:
-	State *done(const gchar *str) throw (Error);
+	State *done(const gchar *str);
 };
 
 class StateScintilla_lParam : public StateExpectString {
 private:
-	State *done(const gchar *str) throw (Error);
+	State *done(const gchar *str);
 };
 
 /*
@@ -356,9 +356,9 @@ private:
  */
 class StateInsert : public StateExpectString {
 protected:
-	void initial(void) throw (Error);
-	void process(const gchar *str, gint new_chars) throw (Error);
-	State *done(const gchar *str) throw (Error);
+	void initial(void);
+	void process(const gchar *str, gint new_chars);
+	State *done(const gchar *str);
 };
 
 namespace States {
diff --git a/src/qregisters.cpp b/src/qregisters.cpp
index a0dc5f5..9cf1461 100644
--- a/src/qregisters.cpp
+++ b/src/qregisters.cpp
@@ -179,7 +179,7 @@ QRegister::undo_edit(void)
 }
 
 void
-QRegister::execute(bool locals) throw (State::Error, ReplaceCmdline)
+QRegister::execute(bool locals)
 {
 	gchar *str = get_string();
 
@@ -367,7 +367,7 @@ QRegSpecMachine::reset(void)
 }
 
 QRegister *
-QRegSpecMachine::input(gchar chr) throw (State::Error)
+QRegSpecMachine::input(gchar chr)
 {
 	gchar *insert;
 
@@ -450,7 +450,7 @@ StateExpectQReg::StateExpectQReg(bool initialize) : State(), machine(initialize)
 }
 
 State *
-StateExpectQReg::custom(gchar chr) throw (Error, ReplaceCmdline)
+StateExpectQReg::custom(gchar chr)
 {
 	QRegister *reg = machine.input(chr);
 
@@ -468,7 +468,7 @@ StateExpectQReg::custom(gchar chr) throw (Error, ReplaceCmdline)
  * stack.
  */
 State *
-StatePushQReg::got_register(QRegister &reg) throw (Error)
+StatePushQReg::got_register(QRegister &reg)
 {
 	BEGIN_EXEC(&States::start);
 
@@ -491,7 +491,7 @@ StatePushQReg::got_register(QRegister &reg) throw (Error)
  * Memory is reclaimed on command-line termination.
  */
 State *
-StatePopQReg::got_register(QRegister &reg) throw (Error)
+StatePopQReg::got_register(QRegister &reg)
 {
 	BEGIN_EXEC(&States::start);
 
@@ -517,7 +517,7 @@ StatePopQReg::got_register(QRegister &reg) throw (Error)
  * The command fails if <file> could not be read.
  */
 State *
-StateEQCommand::got_register(QRegister &reg) throw (Error)
+StateEQCommand::got_register(QRegister &reg)
 {
 	BEGIN_EXEC(&States::loadqreg);
 	register_argument = &reg;
@@ -525,7 +525,7 @@ StateEQCommand::got_register(QRegister &reg) throw (Error)
 }
 
 State *
-StateLoadQReg::done(const gchar *str) throw (Error)
+StateLoadQReg::done(const gchar *str)
 {
 	BEGIN_EXEC(&States::start);
 
@@ -554,7 +554,7 @@ StateLoadQReg::done(const gchar *str) throw (Error)
  * String-building is by default disabled for ^U commands.
  */
 State *
-StateCtlUCommand::got_register(QRegister &reg) throw (Error)
+StateCtlUCommand::got_register(QRegister &reg)
 {
 	BEGIN_EXEC(&States::setqregstring);
 	register_argument = &reg;
@@ -562,7 +562,7 @@ StateCtlUCommand::got_register(QRegister &reg) throw (Error)
 }
 
 State *
-StateSetQRegString::done(const gchar *str) throw (Error)
+StateSetQRegString::done(const gchar *str)
 {
 	BEGIN_EXEC(&States::start);
 
@@ -580,7 +580,7 @@ StateSetQRegString::done(const gchar *str) throw (Error)
  * Specifying an undefined <q> yields an error.
  */
 State *
-StateGetQRegString::got_register(QRegister &reg) throw (Error)
+StateGetQRegString::got_register(QRegister &reg)
 {
 	gchar *str;
 
@@ -608,7 +608,7 @@ StateGetQRegString::got_register(QRegister &reg) throw (Error)
  * The command fails for undefined registers.
  */
 State *
-StateGetQRegInteger::got_register(QRegister &reg) throw (Error)
+StateGetQRegInteger::got_register(QRegister &reg)
 {
 	BEGIN_EXEC(&States::start);
 
@@ -628,7 +628,7 @@ StateGetQRegInteger::got_register(QRegister &reg) throw (Error)
  */
 /** @bug perhaps it's better to imply 0! */
 State *
-StateSetQRegInteger::got_register(QRegister &reg) throw (Error)
+StateSetQRegInteger::got_register(QRegister &reg)
 {
 	BEGIN_EXEC(&States::start);
 
@@ -646,7 +646,7 @@ StateSetQRegInteger::got_register(QRegister &reg) throw (Error)
  * <q> will be defined if it does not exist.
  */
 State *
-StateIncreaseQReg::got_register(QRegister &reg) throw (Error)
+StateIncreaseQReg::got_register(QRegister &reg)
 {
 	tecoInt res;
 
@@ -682,7 +682,7 @@ StateIncreaseQReg::got_register(QRegister &reg) throw (Error)
  * not modify the executed code.
  */
 State *
-StateMacro::got_register(QRegister &reg) throw (Error, ReplaceCmdline)
+StateMacro::got_register(QRegister &reg)
 {
 	BEGIN_EXEC(&States::start);
 
@@ -703,7 +703,7 @@ StateMacro::got_register(QRegister &reg) throw (Error, ReplaceCmdline)
  * If <file> could not be read, the command yields an error.
  */
 State *
-StateMacroFile::done(const gchar *str) throw (Error, ReplaceCmdline)
+StateMacroFile::done(const gchar *str)
 {
 	BEGIN_EXEC(&States::start);
 
@@ -735,7 +735,7 @@ StateMacroFile::done(const gchar *str) throw (Error, ReplaceCmdline)
  * Register <q> will be created if it is undefined.
  */
 State *
-StateCopyToQReg::got_register(QRegister &reg) throw (Error)
+StateCopyToQReg::got_register(QRegister &reg)
 {
 	tecoInt from, len;
 	Sci_TextRange tr;
diff --git a/src/qregisters.h b/src/qregisters.h
index 4b1ad3d..452abe7 100644
--- a/src/qregisters.h
+++ b/src/qregisters.h
@@ -110,7 +110,7 @@ public:
 	virtual void edit(void);
 	virtual void undo_edit(void);
 
-	void execute(bool locals = true) throw (State::Error, ReplaceCmdline);
+	void execute(bool locals = true);
 
 	bool load(const gchar *filename);
 	inline void
@@ -284,7 +284,7 @@ public:
 
 	void reset(void);
 
-	QRegister *input(gchar chr) throw (State::Error);
+	QRegister *input(gchar chr);
 };
 
 /*
@@ -301,16 +301,15 @@ public:
 	StateExpectQReg(bool initialize = false);
 
 private:
-	State *custom(gchar chr) throw (Error, ReplaceCmdline);
+	State *custom(gchar chr);
 
 protected:
-	virtual State *got_register(QRegister &reg)
-				   throw (Error, ReplaceCmdline) = 0;
+	virtual State *got_register(QRegister &reg) = 0;
 };
 
 class StatePushQReg : public StateExpectQReg {
 private:
-	State *got_register(QRegister &reg) throw (Error);
+	State *got_register(QRegister &reg);
 };
 
 class StatePopQReg : public StateExpectQReg {
@@ -318,7 +317,7 @@ public:
 	StatePopQReg() : StateExpectQReg(true) {}
 
 private:
-	State *got_register(QRegister &reg) throw (Error);
+	State *got_register(QRegister &reg);
 };
 
 class StateEQCommand : public StateExpectQReg {
@@ -326,12 +325,12 @@ public:
 	StateEQCommand() : StateExpectQReg(true) {}
 
 private:
-	State *got_register(QRegister &reg) throw (Error);
+	State *got_register(QRegister &reg);
 };
 
 class StateLoadQReg : public StateExpectFile {
 private:
-	State *done(const gchar *str) throw (Error);
+	State *done(const gchar *str);
 };
 
 class StateCtlUCommand : public StateExpectQReg {
@@ -339,7 +338,7 @@ public:
 	StateCtlUCommand() : StateExpectQReg(true) {}
 
 private:
-	State *got_register(QRegister &reg) throw (Error);
+	State *got_register(QRegister &reg);
 };
 
 class StateSetQRegString : public StateExpectString {
@@ -347,17 +346,17 @@ public:
 	StateSetQRegString() : StateExpectString(false) {}
 
 private:
-	State *done(const gchar *str) throw (Error);
+	State *done(const gchar *str);
 };
 
 class StateGetQRegString : public StateExpectQReg {
 private:
-	State *got_register(QRegister &reg) throw (Error);
+	State *got_register(QRegister &reg);
 };
 
 class StateGetQRegInteger : public StateExpectQReg {
 private:
-	State *got_register(QRegister &reg) throw (Error);
+	State *got_register(QRegister &reg);
 };
 
 class StateSetQRegInteger : public StateExpectQReg {
@@ -365,7 +364,7 @@ public:
 	StateSetQRegInteger() : StateExpectQReg(true) {}
 
 private:
-	State *got_register(QRegister &reg) throw (Error);
+	State *got_register(QRegister &reg);
 };
 
 class StateIncreaseQReg : public StateExpectQReg {
@@ -373,17 +372,17 @@ public:
 	StateIncreaseQReg() : StateExpectQReg(true) {}
 
 private:
-	State *got_register(QRegister &reg) throw (Error);
+	State *got_register(QRegister &reg);
 };
 
 class StateMacro : public StateExpectQReg {
 private:
-	State *got_register(QRegister &reg) throw (Error, ReplaceCmdline);
+	State *got_register(QRegister &reg);
 };
 
 class StateMacroFile : public StateExpectFile {
 private:
-	State *done(const gchar *str) throw (Error, ReplaceCmdline);
+	State *done(const gchar *str);
 };
 
 class StateCopyToQReg : public StateExpectQReg {
@@ -391,7 +390,7 @@ public:
 	StateCopyToQReg() : StateExpectQReg(true) {}
 
 private:
-	State *got_register(QRegister &reg) throw (Error);
+	State *got_register(QRegister &reg);
 };
 
 namespace States {
diff --git a/src/ring.cpp b/src/ring.cpp
index 3168c88..134bf63 100644
--- a/src/ring.cpp
+++ b/src/ring.cpp
@@ -568,7 +568,7 @@ get_absolute_path(const gchar *path)
  */
 
 void
-StateEditFile::do_edit(const gchar *filename) throw (Error)
+StateEditFile::do_edit(const gchar *filename)
 {
 	if (ring.current)
 		ring.undo_edit();
@@ -578,7 +578,7 @@ StateEditFile::do_edit(const gchar *filename) throw (Error)
 }
 
 void
-StateEditFile::do_edit(tecoInt id) throw (Error)
+StateEditFile::do_edit(tecoInt id)
 {
 	if (ring.current)
 		ring.undo_edit();
@@ -634,7 +634,7 @@ StateEditFile::do_edit(tecoInt id) throw (Error)
  * ecetera.
  */
 void
-StateEditFile::initial(void) throw (Error)
+StateEditFile::initial(void)
 {
 	tecoInt id = expressions.pop_num_calc(1, -1);
 
@@ -654,7 +654,7 @@ StateEditFile::initial(void) throw (Error)
 }
 
 State *
-StateEditFile::done(const gchar *str) throw (Error)
+StateEditFile::done(const gchar *str)
 {
 	BEGIN_EXEC(&States::start);
 
@@ -740,7 +740,7 @@ StateEditFile::done(const gchar *str) throw (Error)
  * characters are enabled by default.
  */
 State *
-StateSaveFile::done(const gchar *str) throw (Error)
+StateSaveFile::done(const gchar *str)
 {
 	BEGIN_EXEC(&States::start);
 
diff --git a/src/ring.h b/src/ring.h
index b695cb6..70b7738 100644
--- a/src/ring.h
+++ b/src/ring.h
@@ -220,16 +220,16 @@ class StateEditFile : public StateExpectFile {
 private:
 	bool allowFilename;
 
-	void do_edit(const gchar *filename) throw (Error);
-	void do_edit(tecoInt id) throw (Error);
+	void do_edit(const gchar *filename);
+	void do_edit(tecoInt id);
 
-	void initial(void) throw (Error);
-	State *done(const gchar *str) throw (Error);
+	void initial(void);
+	State *done(const gchar *str);
 };
 
 class StateSaveFile : public StateExpectFile {
 private:
-	State *done(const gchar *str) throw (Error);
+	State *done(const gchar *str);
 };
 
 namespace States {
diff --git a/src/search.cpp b/src/search.cpp
index ccf0d53..5972e54 100644
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -108,7 +108,7 @@ namespace States {
  * from the beginning.
  */
 void
-StateSearch::initial(void) throw (Error)
+StateSearch::initial(void)
 {
 	tecoInt v1, v2;
 
@@ -405,7 +405,7 @@ StateSearch::do_search(GRegex *re, gint from, gint to, gint &count)
 }
 
 void
-StateSearch::process(const gchar *str, gint new_chars) throw (Error)
+StateSearch::process(const gchar *str, gint new_chars)
 {
 	static const gint flags = G_REGEX_CASELESS | G_REGEX_MULTILINE |
 				  G_REGEX_DOTALL | G_REGEX_RAW;
@@ -496,7 +496,7 @@ failure:
 }
 
 State *
-StateSearch::done(const gchar *str) throw (Error)
+StateSearch::done(const gchar *str)
 {
 	BEGIN_EXEC(&States::start);
 
@@ -565,7 +565,7 @@ StateSearch::done(const gchar *str) throw (Error)
  * ring.
  */
 void
-StateSearchAll::initial(void) throw (Error)
+StateSearchAll::initial(void)
 {
 	tecoInt v1, v2;
 
@@ -605,7 +605,7 @@ StateSearchAll::initial(void) throw (Error)
 }
 
 State *
-StateSearchAll::done(const gchar *str) throw (Error)
+StateSearchAll::done(const gchar *str)
 {
 	BEGIN_EXEC(&States::start);
 
@@ -635,7 +635,7 @@ StateSearchAll::done(const gchar *str) throw (Error)
  * as-you-type but only on command termination.
  */
 State *
-StateSearchKill::done(const gchar *str) throw (Error)
+StateSearchKill::done(const gchar *str)
 {
 	gint dot;
 
@@ -686,7 +686,7 @@ StateSearchKill::done(const gchar *str) throw (Error)
  * (S) but when found deletes the entire occurrence.
  */
 State *
-StateSearchDelete::done(const gchar *str) throw (Error)
+StateSearchDelete::done(const gchar *str)
 {
 	BEGIN_EXEC(&States::start);
 
@@ -728,7 +728,7 @@ StateSearchDelete::done(const gchar *str) throw (Error)
  * immediately and interactively.
  */
 State *
-StateReplace::done(const gchar *str) throw (Error)
+StateReplace::done(const gchar *str)
 {
 	BEGIN_EXEC(&States::replace_ignore);
 
@@ -742,7 +742,7 @@ StateReplace::done(const gchar *str) throw (Error)
 }
 
 State *
-StateReplace_ignore::done(const gchar *str) throw (Error)
+StateReplace_ignore::done(const gchar *str)
 {
 	return &States::start;
 }
@@ -768,7 +768,7 @@ StateReplace_ignore::done(const gchar *str) throw (Error)
  * register is implied instead.
  */
 State *
-StateReplaceDefault::done(const gchar *str) throw (Error)
+StateReplaceDefault::done(const gchar *str)
 {
 	BEGIN_EXEC(&States::replacedefault_ignore);
 
@@ -782,7 +782,7 @@ StateReplaceDefault::done(const gchar *str) throw (Error)
 }
 
 State *
-StateReplaceDefault_insert::done(const gchar *str) throw (Error)
+StateReplaceDefault_insert::done(const gchar *str)
 {
 	BEGIN_EXEC(&States::start);
 
@@ -801,7 +801,7 @@ StateReplaceDefault_insert::done(const gchar *str) throw (Error)
 }
 
 State *
-StateReplaceDefault_ignore::done(const gchar *str) throw (Error)
+StateReplaceDefault_ignore::done(const gchar *str)
 {
 	BEGIN_EXEC(&States::start);
 
diff --git a/src/search.h b/src/search.h
index f5fd29e..ded5b88 100644
--- a/src/search.h
+++ b/src/search.h
@@ -57,20 +57,20 @@ protected:
 	gchar *pattern2regexp(const gchar *&pattern, bool single_expr = false);
 	void do_search(GRegex *re, gint from, gint to, gint &count);
 
-	virtual void initial(void) throw (Error);
-	virtual void process(const gchar *str, gint new_chars) throw (Error);
-	virtual State *done(const gchar *str) throw (Error);
+	virtual void initial(void);
+	virtual void process(const gchar *str, gint new_chars);
+	virtual State *done(const gchar *str);
 };
 
 class StateSearchAll : public StateSearch {
 private:
-	void initial(void) throw (Error);
-	State *done(const gchar *str) throw (Error);
+	void initial(void);
+	State *done(const gchar *str);
 };
 
 class StateSearchKill : public StateSearch {
 private:
-	State *done(const gchar *str) throw (Error);
+	State *done(const gchar *str);
 };
 
 class StateSearchDelete : public StateSearch {
@@ -78,7 +78,7 @@ public:
 	StateSearchDelete(bool last = true) : StateSearch(last) {}
 
 protected:
-	State *done(const gchar *str) throw (Error);
+	State *done(const gchar *str);
 };
 
 class StateReplace : public StateSearchDelete {
@@ -86,17 +86,17 @@ public:
 	StateReplace() : StateSearchDelete(false) {}
 
 private:
-	State *done(const gchar *str) throw (Error);
+	State *done(const gchar *str);
 };
 
 class StateReplace_insert : public StateInsert {
 private:
-	void initial(void) throw (Error) {}
+	void initial(void) {}
 };
 
 class StateReplace_ignore : public StateExpectString {
 private:
-	State *done(const gchar *str) throw (Error);
+	State *done(const gchar *str);
 };
 
 class StateReplaceDefault : public StateSearchDelete {
@@ -104,18 +104,18 @@ public:
 	StateReplaceDefault() : StateSearchDelete(false) {}
 
 private:
-	State *done(const gchar *str) throw (Error);
+	State *done(const gchar *str);
 };
 
 class StateReplaceDefault_insert : public StateInsert {
 private:
-	void initial(void) throw (Error) {}
-	State *done(const gchar *str) throw (Error);
+	void initial(void) {}
+	State *done(const gchar *str);
 };
 
 class StateReplaceDefault_ignore : public StateExpectString {
 private:
-	State *done(const gchar *str) throw (Error);
+	State *done(const gchar *str);
 };
 
 namespace States {