[Emacs-diffs] Changes to emacs/src/editfns.c

[Miles Bader]

Index: emacs/src/editfns.c
diff -c emacs/src/editfns.c:1.351 emacs/src/editfns.c:1.352
*** emacs/src/editfns.c:1.351   Sun Jan 26 18:21:53 2003
--- emacs/src/editfns.c Tue Feb  4 09:03:12 2003
***************
*** 289,304 ****
  {
    extern Lisp_Object Vmark_even_if_inactive; /* Defined in callint.c. */
    Lisp_Object m;
!   
    if (!NILP (Vtransient_mark_mode)
        && NILP (Vmark_even_if_inactive)
        && NILP (current_buffer->mark_active))
      Fsignal (Qmark_inactive, Qnil);
!   
    m = Fmarker_position (current_buffer->mark);
    if (NILP (m))
      error ("The mark is not set now, so there is no region");
!   
    if ((PT < XFASTINT (m)) == beginningp)
      m = make_number (PT);
    return m;
--- 289,304 ----
  {
    extern Lisp_Object Vmark_even_if_inactive; /* Defined in callint.c. */
    Lisp_Object m;
! 
    if (!NILP (Vtransient_mark_mode)
        && NILP (Vmark_even_if_inactive)
        && NILP (current_buffer->mark_active))
      Fsignal (Qmark_inactive, Qnil);
! 
    m = Fmarker_position (current_buffer->mark);
    if (NILP (m))
      error ("The mark is not set now, so there is no region");
! 
    if ((PT < XFASTINT (m)) == beginningp)
      m = make_number (PT);
    return m;
***************
*** 456,462 ****
                }
            }
        }
!       
      }
  
    { /* Now check the text-properties.  */
--- 456,462 ----
                }
            }
        }
! 
      }
  
    { /* Now check the text-properties.  */
***************
*** 881,887 ****
    /* visible */
    info = XCDR (info);
    visible_p = !NILP (XCAR (info));
!   
  #if 0 /* We used to make the current buffer visible in the selected window
         if that was true previously.  That avoids some anomalies.
         But it creates others, and it wasn't documented, and it is simpler
--- 881,887 ----
    /* visible */
    info = XCDR (info);
    visible_p = !NILP (XCAR (info));
! 
  #if 0 /* We used to make the current buffer visible in the selected window
         if that was true previously.  That avoids some anomalies.
         But it creates others, and it wasn't documented, and it is simpler
***************
*** 2952,2958 ****
                             clip_to_bounds (beg->charpos, pt, end->charpos),
                             clip_to_bounds (beg->bytepos, BUF_PT_BYTE (buf),
                                             end->bytepos));
!         
          buf->clip_changed = 1; /* Remember that the narrowing changed. */
        }
      }
--- 2952,2958 ----
                             clip_to_bounds (beg->charpos, pt, end->charpos),
                             clip_to_bounds (beg->bytepos, BUF_PT_BYTE (buf),
                                             end->bytepos));
! 
          buf->clip_changed = 1; /* Remember that the narrowing changed. */
        }
      }