aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDima Kogan2017-01-31 07:46:10 -0800
committerDima Kogan2017-01-31 07:49:37 -0800
commitfbf74c158ea81ff6349f68760f8861c1c497c989 (patch)
tree5efc784d12ec1b735fcd720bd488f8325fa5d849 /src
parentf3c77d11af65f3b319b1784b4c3cf08c51aa7997 (diff)
downloademacs-fbf74c158ea81ff6349f68760f8861c1c497c989.tar.gz
emacs-fbf74c158ea81ff6349f68760f8861c1c497c989.zip
Revert two accidental commits
This reverts commit f3c77d11af65f3b319b1784b4c3cf08c51aa7997. This reverts commit 3c941b900007c9e79c00af0f21d88154f6d8af1a.
Diffstat (limited to 'src')
-rw-r--r--src/data.c50
-rw-r--r--src/fns.c4
2 files changed, 0 insertions, 54 deletions
diff --git a/src/data.c b/src/data.c
index 26ff9948828..8e07bf01b44 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1304,56 +1304,6 @@ set_internal (Lisp_Object symbol, Lisp_Object newval, Lisp_Object where,
1304 default: emacs_abort (); 1304 default: emacs_abort ();
1305 } 1305 }
1306 1306
1307
1308 const char* symname = SDATA(sym->name);
1309
1310 if( EQ(Vwatch_object, symbol) )
1311 {
1312 static int nest_level = 0;
1313 if(nest_level++ == 0)
1314 {
1315 switch(sym->redirect)
1316 {
1317 case SYMBOL_PLAINVAL:
1318 {
1319 AUTO_STRING (format, "Setting symbol '%s'; redirect: SYMBOL_PLAINVAL");
1320 CALLN (Fmessage, format, SYMBOL_NAME (symbol));
1321 break;
1322 }
1323 case SYMBOL_VARALIAS:
1324 {
1325 AUTO_STRING (format, "Setting symbol '%s'; redirect: SYMBOL_VARALIAS");
1326 CALLN (Fmessage, format, SYMBOL_NAME (symbol));
1327 break;
1328 }
1329 case SYMBOL_LOCALIZED:
1330 {
1331 AUTO_STRING (format, "Setting symbol '%s'; redirect: SYMBOL_LOCALIZED");
1332 CALLN (Fmessage, format, SYMBOL_NAME (symbol));
1333 break;
1334 }
1335 case SYMBOL_FORWARDED:
1336 {
1337 AUTO_STRING (format, "Setting symbol '%s'; redirect: SYMBOL_FORWARDED");
1338 CALLN (Fmessage, format, SYMBOL_NAME (symbol));
1339 break;
1340 }
1341
1342 default:
1343 {
1344 AUTO_STRING (format, "Setting symbol '%s'; redirect: UNKNOWN");
1345 CALLN (Fmessage, format, SYMBOL_NAME (symbol));
1346 break;
1347 }
1348 }
1349 }
1350 nest_level--;
1351 }
1352
1353
1354
1355
1356
1357 start: 1307 start:
1358 switch (sym->redirect) 1308 switch (sym->redirect)
1359 { 1309 {
diff --git a/src/fns.c b/src/fns.c
index 9eabc1414f4..136a2198c2c 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -5120,10 +5120,6 @@ On some platforms, file selection dialogs are also enabled if this is
5120non-nil. */); 5120non-nil. */);
5121 use_dialog_box = 1; 5121 use_dialog_box = 1;
5122 5122
5123 DEFVAR_LISP("watch-object", Vwatch_object,
5124 doc: /* Symbol to watch. */);
5125 Vwatch_object = Qnil;
5126
5127 DEFVAR_BOOL ("use-file-dialog", use_file_dialog, 5123 DEFVAR_BOOL ("use-file-dialog", use_file_dialog,
5128 doc: /* Non-nil means mouse commands use a file dialog to ask for files. 5124 doc: /* Non-nil means mouse commands use a file dialog to ask for files.
5129This applies to commands from menus and tool bar buttons even when 5125This applies to commands from menus and tool bar buttons even when