--- a/gdb/CVS/Entries
+++ b/gdb/CVS/Entries
@@ -604,12 +604,8 @@ D/vx-share////
 /varobj.h/1.15/Fri Feb  1 06:16:40 2008/-ko/
 /win32-nat.c/1.150/Fri Feb  1 06:16:40 2008/-ko/
 D/src////
-/ChangeLog/1.9129/Fri Feb  1 16:18:59 2008/-ko/
 /NEWS/1.255/Fri Feb  1 09:46:46 2008/-ko/
-/breakpoint.c/1.300/Fri Feb  1 16:03:10 2008/-ko/
-/breakpoint.h/1.64/Fri Feb  1 16:03:10 2008/-ko/
 /eval.c/1.79/Fri Feb  1 09:46:46 2008/-ko/
-/gdb.h/1.9/Fri Feb  1 16:03:10 2008//
 /infcmd.c/1.169/Fri Feb  1 09:46:46 2008/-ko/
 /ppc-sysv-tdep.c/1.47/Fri Feb  1 16:19:00 2008//
 /ppc-tdep.h/1.64/Fri Feb  1 09:46:46 2008//
@@ -618,3 +614,7 @@ D/src////
 /s390-tdep.c/1.170/Fri Feb  1 09:46:46 2008//
 /std-regs.c/1.26/Fri Feb  1 09:46:46 2008//
 /version.in/1.2403/Fri Feb  1 09:46:46 2008//
+/ChangeLog/1.9130/Fri Feb  1 16:23:32 2008/-ko/
+/breakpoint.c/1.301/Fri Feb  1 16:22:56 2008/-ko/
+/breakpoint.h/1.65/Fri Feb  1 16:22:56 2008/-ko/
+/gdb.h/1.10/Fri Feb  1 16:22:56 2008//

--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,17 @@
+2008-02-01  Vladimir Prus  <vladimir@codesourcery.com>
+	
+        * breakpoint.c (break_command_1): Return void.
+        (break_command_really): Return void.  Rethrow
+        exceptions instead of returning.
+        (gdb_breakpoint): Remove the error_message parameter.
+        Return void.  Rename to set_breakpoint.
+        * gdb.h (gdb_breakpoint): Rename and move to...
+	* breakpoint.h (set_breakpoint): ...here.
+        * mi/mi-cmb-break.c (mi_cmd_break_insert): Restore
+        event hooks even if exception is thrown.  Adjust to
+        gdb_breakpoint interface changes.
+	
+
 2008-02-01  Thiago Jung Bauermann  <bauerman@br.ibm.com>
 
 	* ppc-sysv-tdep.c (ppc64_sysv_abi_push_dummy_call): Write 32-bit

--- a/gdb/mi/CVS/Entries
+++ b/gdb/mi/CVS/Entries
@@ -22,5 +22,5 @@
 /mi-cmds.h/1.27/Wed Jan 30 07:46:22 2008//
 /mi-cmd-file.c/1.8/Fri Feb  1 06:16:40 2008//
 /mi-cmd-var.c/1.45/Fri Feb  1 06:16:40 2008//
-/mi-cmd-break.c/1.18/Fri Feb  1 16:03:10 2008//
+/mi-cmd-break.c/1.19/Fri Feb  1 16:22:56 2008//
 D

--- a/gdb/testsuite/CVS/Entries
+++ b/gdb/testsuite/CVS/Entries
@@ -30,4 +30,4 @@ D/lib////
 D/gdb.c++////
 D/gdb.chill////
 D/gdb.gdbserver////
-/ChangeLog/1.1560/Fri Feb  1 09:46:46 2008/-ko/
+/ChangeLog/1.1561/Fri Feb  1 16:24:09 2008/-ko/

--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,12 @@
 2008-02-01  Vladimir Prus  <vladimir@codesourcery.com>
 
+	* gdb.mi/basic.c (return_1): New function.
+        * gdb.mi/mi-break.exp: Make sure that failed -break-insert
+        don't cause future evaluations of function to report
+        creation of internal breakpoints.
+
+2008-02-01  Vladimir Prus  <vladimir@codesourcery.com>
+
 	* gdb.mi/mi-break.exp (test_error): New.
 	Call it.
 

--- a/gdb/testsuite/gdb.mi/CVS/Entries
+++ b/gdb/testsuite/gdb.mi/CVS/Entries
@@ -67,6 +67,6 @@
 /var-cmd.c/1.16/Wed Jan 30 06:44:58 2008//
 /mi-file.exp/1.12/Fri Feb  1 06:16:40 2008//
 /mi2-file.exp/1.12/Fri Feb  1 06:16:40 2008//
-/basics.c/1.11/Fri Feb  1 16:03:10 2008//
-/mi-break.exp/1.14/Fri Feb  1 16:03:10 2008//
+/basics.c/1.12/Fri Feb  1 16:22:56 2008//
+/mi-break.exp/1.15/Fri Feb  1 16:22:56 2008//
 D