aboutsummaryrefslogtreecommitdiffstats
path: root/src/data.c
diff options
context:
space:
mode:
authorPaul Eggert2019-04-29 08:39:34 -0700
committerPaul Eggert2019-04-29 08:40:01 -0700
commit82ba72ad7a4121524ee989cde09d61dab6b34dbc (patch)
tree929897f959eff5e58e7eb9d5407b8297e50311d3 /src/data.c
parent295c79750341df94e894a95ce51401f989fc7f48 (diff)
downloademacs-82ba72ad7a4121524ee989cde09d61dab6b34dbc.tar.gz
emacs-82ba72ad7a4121524ee989cde09d61dab6b34dbc.zip
Replace ‘/* FALLTHROUGH! */’ with ‘break;’
* src/data.c (set_internal, set_default_internal): Replace obsolescent /* FALLTHROUGH! */ comments with ‘break;’, as ‘FALLTHROUGH;’ is not needed here.
Diffstat (limited to 'src/data.c')
-rw-r--r--src/data.c23
1 files changed, 11 insertions, 12 deletions
diff --git a/src/data.c b/src/data.c
index 7928a1dc41d..476d28eadbc 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1301,15 +1301,13 @@ set_internal (Lisp_Object symbol, Lisp_Object newval, Lisp_Object where,
1301 enum Set_Internal_Bind bindflag) 1301 enum Set_Internal_Bind bindflag)
1302{ 1302{
1303 bool voide = EQ (newval, Qunbound); 1303 bool voide = EQ (newval, Qunbound);
1304 struct Lisp_Symbol *sym;
1305 Lisp_Object tem1;
1306 1304
1307 /* If restoring in a dead buffer, do nothing. */ 1305 /* If restoring in a dead buffer, do nothing. */
1308 /* if (BUFFERP (where) && NILP (XBUFFER (where)->name)) 1306 /* if (BUFFERP (where) && NILP (XBUFFER (where)->name))
1309 return; */ 1307 return; */
1310 1308
1311 CHECK_SYMBOL (symbol); 1309 CHECK_SYMBOL (symbol);
1312 sym = XSYMBOL (symbol); 1310 struct Lisp_Symbol *sym = XSYMBOL (symbol);
1313 switch (sym->u.s.trapped_write) 1311 switch (sym->u.s.trapped_write)
1314 { 1312 {
1315 case SYMBOL_NOWRITE: 1313 case SYMBOL_NOWRITE:
@@ -1328,9 +1326,10 @@ set_internal (Lisp_Object symbol, Lisp_Object newval, Lisp_Object where,
1328 bindflag == SET_INTERNAL_UNBIND? Qunlet : 1326 bindflag == SET_INTERNAL_UNBIND? Qunlet :
1329 voide? Qmakunbound : Qset), 1327 voide? Qmakunbound : Qset),
1330 where); 1328 where);
1331 /* FALLTHROUGH! */ 1329 break;
1330
1332 case SYMBOL_UNTRAPPED_WRITE: 1331 case SYMBOL_UNTRAPPED_WRITE:
1333 break; 1332 break;
1334 1333
1335 default: emacs_abort (); 1334 default: emacs_abort ();
1336 } 1335 }
@@ -1363,8 +1362,9 @@ set_internal (Lisp_Object symbol, Lisp_Object newval, Lisp_Object where,
1363 1362
1364 /* Find the new binding. */ 1363 /* Find the new binding. */
1365 XSETSYMBOL (symbol, sym); /* May have changed via aliasing. */ 1364 XSETSYMBOL (symbol, sym); /* May have changed via aliasing. */
1366 tem1 = assq_no_quit (symbol, 1365 Lisp_Object tem1
1367 BVAR (XBUFFER (where), local_var_alist)); 1366 = assq_no_quit (symbol,
1367 BVAR (XBUFFER (where), local_var_alist));
1368 set_blv_where (blv, where); 1368 set_blv_where (blv, where);
1369 blv->found = true; 1369 blv->found = true;
1370 1370
@@ -1649,10 +1649,8 @@ void
1649set_default_internal (Lisp_Object symbol, Lisp_Object value, 1649set_default_internal (Lisp_Object symbol, Lisp_Object value,
1650 enum Set_Internal_Bind bindflag) 1650 enum Set_Internal_Bind bindflag)
1651{ 1651{
1652 struct Lisp_Symbol *sym;
1653
1654 CHECK_SYMBOL (symbol); 1652 CHECK_SYMBOL (symbol);
1655 sym = XSYMBOL (symbol); 1653 struct Lisp_Symbol *sym = XSYMBOL (symbol);
1656 switch (sym->u.s.trapped_write) 1654 switch (sym->u.s.trapped_write)
1657 { 1655 {
1658 case SYMBOL_NOWRITE: 1656 case SYMBOL_NOWRITE:
@@ -1669,9 +1667,10 @@ set_default_internal (Lisp_Object symbol, Lisp_Object value,
1669 /* Setting due to thread switching doesn't count. */ 1667 /* Setting due to thread switching doesn't count. */
1670 && bindflag != SET_INTERNAL_THREAD_SWITCH) 1668 && bindflag != SET_INTERNAL_THREAD_SWITCH)
1671 notify_variable_watchers (symbol, value, Qset_default, Qnil); 1669 notify_variable_watchers (symbol, value, Qset_default, Qnil);
1672 /* FALLTHROUGH! */ 1670 break;
1671
1673 case SYMBOL_UNTRAPPED_WRITE: 1672 case SYMBOL_UNTRAPPED_WRITE:
1674 break; 1673 break;
1675 1674
1676 default: emacs_abort (); 1675 default: emacs_abort ();
1677 } 1676 }