aboutsummaryrefslogtreecommitdiffstats
path: root/src/cmds.c
diff options
context:
space:
mode:
authorK. Handa2016-01-03 17:53:43 +0900
committerK. Handa2016-01-03 17:53:43 +0900
commitfb6d826c69939c2d016c1b824d4e9bcb53d9e643 (patch)
treeb9ce862d6cbe25e740203421984df21e4cbadbf4 /src/cmds.c
parent536f48e9a2251b9e654ea974bd90ff2f40218753 (diff)
parent91917dd58ec5278e555b9c693a830749083e8f89 (diff)
downloademacs-fb6d826c69939c2d016c1b824d4e9bcb53d9e643.tar.gz
emacs-fb6d826c69939c2d016c1b824d4e9bcb53d9e643.zip
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/cmds.c')
-rw-r--r--src/cmds.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cmds.c b/src/cmds.c
index 167ebb74302..650b4628c32 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -233,7 +233,7 @@ because it respects values of `delete-active-region' and `overwrite-mode'. */)
233 CHECK_NUMBER (n); 233 CHECK_NUMBER (n);
234 234
235 if (eabs (XINT (n)) < 2) 235 if (eabs (XINT (n)) < 2)
236 call0 (Qundo_auto__amalgamate); 236 call0 (Qundo_auto_amalgamate);
237 237
238 pos = PT + XINT (n); 238 pos = PT + XINT (n);
239 if (NILP (killflag)) 239 if (NILP (killflag))
@@ -279,7 +279,7 @@ At the end, it runs `post-self-insert-hook'. */)
279 error ("Negative repetition argument %"pI"d", XINT (n)); 279 error ("Negative repetition argument %"pI"d", XINT (n));
280 280
281 if (XFASTINT (n) < 2) 281 if (XFASTINT (n) < 2)
282 call0 (Qundo_auto__amalgamate); 282 call0 (Qundo_auto_amalgamate);
283 283
284 /* Barf if the key that invoked this was not a character. */ 284 /* Barf if the key that invoked this was not a character. */
285 if (!CHARACTERP (last_command_event)) 285 if (!CHARACTERP (last_command_event))
@@ -494,7 +494,7 @@ internal_self_insert (int c, EMACS_INT n)
494void 494void
495syms_of_cmds (void) 495syms_of_cmds (void)
496{ 496{
497 DEFSYM (Qundo_auto__amalgamate, "undo-auto--amalgamate"); 497 DEFSYM (Qundo_auto_amalgamate, "undo-auto-amalgamate");
498 DEFSYM (Qundo_auto__this_command_amalgamating, 498 DEFSYM (Qundo_auto__this_command_amalgamating,
499 "undo-auto--this-command-amalgamating"); 499 "undo-auto--this-command-amalgamating");
500 500