[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/callint.c
From: |
Richard M. Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/src/callint.c |
Date: |
Thu, 31 Jan 2002 23:32:25 -0500 |
Index: emacs/src/callint.c
diff -c emacs/src/callint.c:1.111 emacs/src/callint.c:1.112
*** emacs/src/callint.c:1.111 Sat Dec 22 08:55:34 2001
--- emacs/src/callint.c Thu Jan 31 23:32:24 2002
***************
*** 160,171 ****
= {"", "point", "mark", "region-beginning", "region-end"};
static void
! check_mark ()
{
Lisp_Object tem;
tem = Fmarker_buffer (current_buffer->mark);
if (NILP (tem) || (XBUFFER (tem) != current_buffer))
! error ("The mark is not set now");
if (!NILP (Vtransient_mark_mode) && NILP (Vmark_even_if_inactive)
&& NILP (current_buffer->mark_active))
Fsignal (Qmark_inactive, Qnil);
--- 160,173 ----
= {"", "point", "mark", "region-beginning", "region-end"};
static void
! check_mark (for_region)
! int for_region;
{
Lisp_Object tem;
tem = Fmarker_buffer (current_buffer->mark);
if (NILP (tem) || (XBUFFER (tem) != current_buffer))
! error (for_region ? "The mark is not set now, so there is no region"
! : "The mark is not set now");
if (!NILP (Vtransient_mark_mode) && NILP (Vmark_even_if_inactive)
&& NILP (current_buffer->mark_active))
Fsignal (Qmark_inactive, Qnil);
***************
*** 609,615 ****
break;
case 'm': /* Value of mark. Does not do I/O. */
! check_mark ();
/* visargs[i] = Qnil; */
args[i] = current_buffer->mark;
varies[i] = 2;
--- 611,617 ----
break;
case 'm': /* Value of mark. Does not do I/O. */
! check_mark (0);
/* visargs[i] = Qnil; */
args[i] = current_buffer->mark;
varies[i] = 2;
***************
*** 664,670 ****
break;
case 'r': /* Region, point and mark as 2 args. */
! check_mark ();
set_marker_both (point_marker, Qnil, PT, PT_BYTE);
/* visargs[i+1] = Qnil; */
foo = marker_position (current_buffer->mark);
--- 666,672 ----
break;
case 'r': /* Region, point and mark as 2 args. */
! check_mark (1);
set_marker_both (point_marker, Qnil, PT, PT_BYTE);
/* visargs[i+1] = Qnil; */
foo = marker_position (current_buffer->mark);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/src/callint.c,
Richard M. Stallman <=