aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKarl Heuer1994-03-23 22:26:28 +0000
committerKarl Heuer1994-03-23 22:26:28 +0000
commit86c1cf234ed5b5d1147d0aa1d8a5ac9787814429 (patch)
tree96f59658e38024c2be912303ea1a1353c07257ef /src
parentc99fc30f5659db76b1352444038546312c96ebdf (diff)
downloademacs-86c1cf234ed5b5d1147d0aa1d8a5ac9787814429.tar.gz
emacs-86c1cf234ed5b5d1147d0aa1d8a5ac9787814429.zip
(check_mark, Fcall_interactively): Use assignment, not initialization.
Diffstat (limited to 'src')
-rw-r--r--src/callint.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/callint.c b/src/callint.c
index 340ab5a617a..c5a57b7ac3f 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -142,7 +142,8 @@ char *callint_argfuns[]
142static void 142static void
143check_mark () 143check_mark ()
144{ 144{
145 Lisp_Object tem = Fmarker_buffer (current_buffer->mark); 145 Lisp_Object tem;
146 tem = Fmarker_buffer (current_buffer->mark);
146 if (NILP (tem) || (XBUFFER (tem) != current_buffer)) 147 if (NILP (tem) || (XBUFFER (tem) != current_buffer))
147 error ("The mark is not set now"); 148 error ("The mark is not set now");
148 if (!NILP (Vtransient_mark_mode) && NILP (Vmark_even_if_inactive) 149 if (!NILP (Vtransient_mark_mode) && NILP (Vmark_even_if_inactive)
@@ -321,9 +322,9 @@ Otherwise, this is done only if an arg is read using the minibuffer.")
321 } 322 }
322 else if (*string == '@') 323 else if (*string == '@')
323 { 324 {
324 Lisp_Object event = 325 Lisp_Object event;
325 XVECTOR (this_command_keys)->contents[next_event];
326 326
327 event = XVECTOR (this_command_keys)->contents[next_event];
327 if (EVENT_HAS_PARAMETERS (event) 328 if (EVENT_HAS_PARAMETERS (event)
328 && XTYPE (event = XCONS (event)->cdr) == Lisp_Cons 329 && XTYPE (event = XCONS (event)->cdr) == Lisp_Cons
329 && XTYPE (event = XCONS (event)->car) == Lisp_Cons 330 && XTYPE (event = XCONS (event)->car) == Lisp_Cons