/[emacs]/emacs/src/buffer.c
ViewVC logotype

Diff of /emacs/src/buffer.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.368 by gerd, Thu Nov 1 10:23:52 2001 UTC revision 1.369 by pj, Fri Nov 2 20:16:42 2001 UTC
# Line 220  If the optional arg FRAME is a frame, we Line 220  If the optional arg FRAME is a frame, we
220      {      {
221        Lisp_Object tail;        Lisp_Object tail;
222    
223        CHECK_FRAME (frame, 1);        CHECK_FRAME (frame);
224    
225        framelist = Fcopy_sequence (XFRAME (frame)->buffer_list);        framelist = Fcopy_sequence (XFRAME (frame)->buffer_list);
226    
# Line 267  NAME may also be a buffer; if so, the va Line 267  NAME may also be a buffer; if so, the va
267  {  {
268    if (BUFFERP (name))    if (BUFFERP (name))
269      return name;      return name;
270    CHECK_STRING (name, 0);    CHECK_STRING (name);
271    
272    return Fcdr (assoc_ignore_text_properties (name, Vbuffer_alist));    return Fcdr (assoc_ignore_text_properties (name, Vbuffer_alist));
273  }  }
# Line 283  See also `find-buffer-visiting'.  */) Line 283  See also `find-buffer-visiting'.  */)
283    register Lisp_Object tail, buf, tem;    register Lisp_Object tail, buf, tem;
284    Lisp_Object handler;    Lisp_Object handler;
285    
286    CHECK_STRING (filename, 0);    CHECK_STRING (filename);
287    filename = Fexpand_file_name (filename, Qnil);    filename = Fexpand_file_name (filename, Qnil);
288    
289    /* If the file name has special constructs in it,    /* If the file name has special constructs in it,
# Line 739  even if a buffer with that name exists. Line 739  even if a buffer with that name exists.
739    int count;    int count;
740    char number[10];    char number[10];
741    
742    CHECK_STRING (name, 0);    CHECK_STRING (name);
743    
744    tem = Fget_buffer (name);    tem = Fget_buffer (name);
745    if (NILP (tem))    if (NILP (tem))
# Line 768  With no argument or nil as argument, ret Line 768  With no argument or nil as argument, ret
768  {  {
769    if (NILP (buffer))    if (NILP (buffer))
770      return current_buffer->name;      return current_buffer->name;
771    CHECK_BUFFER (buffer, 0);    CHECK_BUFFER (buffer);
772    return XBUFFER (buffer)->name;    return XBUFFER (buffer)->name;
773  }  }
774    
# Line 780  No argument or nil as argument means use Line 780  No argument or nil as argument means use
780  {  {
781    if (NILP (buffer))    if (NILP (buffer))
782      return current_buffer->filename;      return current_buffer->filename;
783    CHECK_BUFFER (buffer, 0);    CHECK_BUFFER (buffer);
784    return XBUFFER (buffer)->filename;    return XBUFFER (buffer)->filename;
785  }  }
786    
# Line 798  If BUFFER is not indirect, return nil. Line 798  If BUFFER is not indirect, return nil.
798      base = current_buffer->base_buffer;      base = current_buffer->base_buffer;
799    else    else
800      {      {
801        CHECK_BUFFER (buffer, 0);        CHECK_BUFFER (buffer);
802        base = XBUFFER (buffer)->base_buffer;        base = XBUFFER (buffer)->base_buffer;
803      }      }
804    
# Line 825  No argument or nil as argument means use Line 825  No argument or nil as argument means use
825      buf = current_buffer;      buf = current_buffer;
826    else    else
827      {      {
828        CHECK_BUFFER (buffer, 0);        CHECK_BUFFER (buffer);
829        buf = XBUFFER (buffer);        buf = XBUFFER (buffer);
830      }      }
831    
# Line 892  No argument or nil as argument means use Line 892  No argument or nil as argument means use
892      buf = current_buffer;      buf = current_buffer;
893    else    else
894      {      {
895        CHECK_BUFFER (buffer, 0);        CHECK_BUFFER (buffer);
896        buf = XBUFFER (buffer);        buf = XBUFFER (buffer);
897      }      }
898    
# Line 994  No argument or nil as argument means use Line 994  No argument or nil as argument means use
994      buf = current_buffer;      buf = current_buffer;
995    else    else
996      {      {
997        CHECK_BUFFER (buffer, 0);        CHECK_BUFFER (buffer);
998        buf = XBUFFER (buffer);        buf = XBUFFER (buffer);
999      }      }
1000    
# Line 1016  This does not change the name of the vis Line 1016  This does not change the name of the vis
1016  {  {
1017    register Lisp_Object tem, buf;    register Lisp_Object tem, buf;
1018    
1019    CHECK_STRING (newname, 0);    CHECK_STRING (newname);
1020    
1021    if (XSTRING (newname)->size == 0)    if (XSTRING (newname)->size == 0)
1022      error ("Empty string is invalid as a buffer name");      error ("Empty string is invalid as a buffer name");
# Line 1903  void Line 1903  void
1903  validate_region (b, e)  validate_region (b, e)
1904       register Lisp_Object *b, *e;       register Lisp_Object *b, *e;
1905  {  {
1906    CHECK_NUMBER_COERCE_MARKER (*b, 0);    CHECK_NUMBER_COERCE_MARKER (*b);
1907    CHECK_NUMBER_COERCE_MARKER (*e, 1);    CHECK_NUMBER_COERCE_MARKER (*e);
1908    
1909    if (XINT (*b) > XINT (*e))    if (XINT (*b) > XINT (*e))
1910      {      {
# Line 3371  rear delimiter advance when text is inse Line 3371  rear delimiter advance when text is inse
3371    if (NILP (buffer))    if (NILP (buffer))
3372      XSETBUFFER (buffer, current_buffer);      XSETBUFFER (buffer, current_buffer);
3373    else    else
3374      CHECK_BUFFER (buffer, 2);      CHECK_BUFFER (buffer);
3375    if (MARKERP (beg)    if (MARKERP (beg)
3376        && ! EQ (Fmarker_buffer (beg), buffer))        && ! EQ (Fmarker_buffer (beg), buffer))
3377      error ("Marker points into wrong buffer");      error ("Marker points into wrong buffer");
# Line 3379  rear delimiter advance when text is inse Line 3379  rear delimiter advance when text is inse
3379        && ! EQ (Fmarker_buffer (end), buffer))        && ! EQ (Fmarker_buffer (end), buffer))
3380      error ("Marker points into wrong buffer");      error ("Marker points into wrong buffer");
3381    
3382    CHECK_NUMBER_COERCE_MARKER (beg, 1);    CHECK_NUMBER_COERCE_MARKER (beg);
3383    CHECK_NUMBER_COERCE_MARKER (end, 1);    CHECK_NUMBER_COERCE_MARKER (end);
3384    
3385    if (XINT (beg) > XINT (end))    if (XINT (beg) > XINT (end))
3386      {      {
# Line 3462  buffer.  */) Line 3462  buffer.  */)
3462    Lisp_Object obuffer;    Lisp_Object obuffer;
3463    int count = specpdl_ptr - specpdl;    int count = specpdl_ptr - specpdl;
3464    
3465    CHECK_OVERLAY (overlay, 0);    CHECK_OVERLAY (overlay);
3466    if (NILP (buffer))    if (NILP (buffer))
3467      buffer = Fmarker_buffer (OVERLAY_START (overlay));      buffer = Fmarker_buffer (OVERLAY_START (overlay));
3468    if (NILP (buffer))    if (NILP (buffer))
3469      XSETBUFFER (buffer, current_buffer);      XSETBUFFER (buffer, current_buffer);
3470    CHECK_BUFFER (buffer, 3);    CHECK_BUFFER (buffer);
3471    
3472    if (MARKERP (beg)    if (MARKERP (beg)
3473        && ! EQ (Fmarker_buffer (beg), buffer))        && ! EQ (Fmarker_buffer (beg), buffer))
# Line 3476  buffer.  */) Line 3476  buffer.  */)
3476        && ! EQ (Fmarker_buffer (end), buffer))        && ! EQ (Fmarker_buffer (end), buffer))
3477      error ("Marker points into wrong buffer");      error ("Marker points into wrong buffer");
3478    
3479    CHECK_NUMBER_COERCE_MARKER (beg, 1);    CHECK_NUMBER_COERCE_MARKER (beg);
3480    CHECK_NUMBER_COERCE_MARKER (end, 1);    CHECK_NUMBER_COERCE_MARKER (end);
3481    
3482    if (XINT (beg) == XINT (end) && ! NILP (Foverlay_get (overlay, Qevaporate)))    if (XINT (beg) == XINT (end) && ! NILP (Foverlay_get (overlay, Qevaporate)))
3483      return Fdelete_overlay (overlay);      return Fdelete_overlay (overlay);
# Line 3563  DEFUN ("delete-overlay", Fdelete_overlay Line 3563  DEFUN ("delete-overlay", Fdelete_overlay
3563    struct buffer *b;    struct buffer *b;
3564    int count = specpdl_ptr - specpdl;    int count = specpdl_ptr - specpdl;
3565    
3566    CHECK_OVERLAY (overlay, 0);    CHECK_OVERLAY (overlay);
3567    
3568    buffer = Fmarker_buffer (OVERLAY_START (overlay));    buffer = Fmarker_buffer (OVERLAY_START (overlay));
3569    if (NILP (buffer))    if (NILP (buffer))
# Line 3599  DEFUN ("overlay-start", Foverlay_start, Line 3599  DEFUN ("overlay-start", Foverlay_start,
3599       (overlay)       (overlay)
3600       Lisp_Object overlay;       Lisp_Object overlay;
3601  {  {
3602    CHECK_OVERLAY (overlay, 0);    CHECK_OVERLAY (overlay);
3603    
3604    return (Fmarker_position (OVERLAY_START (overlay)));    return (Fmarker_position (OVERLAY_START (overlay)));
3605  }  }
# Line 3609  DEFUN ("overlay-end", Foverlay_end, Sove Line 3609  DEFUN ("overlay-end", Foverlay_end, Sove
3609       (overlay)       (overlay)
3610       Lisp_Object overlay;       Lisp_Object overlay;
3611  {  {
3612    CHECK_OVERLAY (overlay, 0);    CHECK_OVERLAY (overlay);
3613    
3614    return (Fmarker_position (OVERLAY_END (overlay)));    return (Fmarker_position (OVERLAY_END (overlay)));
3615  }  }
# Line 3619  DEFUN ("overlay-buffer", Foverlay_buffer Line 3619  DEFUN ("overlay-buffer", Foverlay_buffer
3619       (overlay)       (overlay)
3620         Lisp_Object overlay;         Lisp_Object overlay;
3621  {  {
3622    CHECK_OVERLAY (overlay, 0);    CHECK_OVERLAY (overlay);
3623    
3624    return Fmarker_buffer (OVERLAY_START (overlay));    return Fmarker_buffer (OVERLAY_START (overlay));
3625  }  }
# Line 3631  OVERLAY.  */) Line 3631  OVERLAY.  */)
3631       (overlay)       (overlay)
3632      Lisp_Object overlay;      Lisp_Object overlay;
3633  {  {
3634    CHECK_OVERLAY (overlay, 0);    CHECK_OVERLAY (overlay);
3635    
3636    return Fcopy_sequence (XOVERLAY (overlay)->plist);    return Fcopy_sequence (XOVERLAY (overlay)->plist);
3637  }  }
# Line 3647  DEFUN ("overlays-at", Foverlays_at, Sove Line 3647  DEFUN ("overlays-at", Foverlays_at, Sove
3647    int len;    int len;
3648    Lisp_Object result;    Lisp_Object result;
3649    
3650    CHECK_NUMBER_COERCE_MARKER (pos, 0);    CHECK_NUMBER_COERCE_MARKER (pos);
3651    
3652    len = 10;    len = 10;
3653    /* We can't use alloca here because overlays_at can call xrealloc.  */    /* We can't use alloca here because overlays_at can call xrealloc.  */
# Line 3679  or between BEG and END.  */) Line 3679  or between BEG and END.  */)
3679    int len;    int len;
3680    Lisp_Object result;    Lisp_Object result;
3681    
3682    CHECK_NUMBER_COERCE_MARKER (beg, 0);    CHECK_NUMBER_COERCE_MARKER (beg);
3683    CHECK_NUMBER_COERCE_MARKER (end, 0);    CHECK_NUMBER_COERCE_MARKER (end);
3684    
3685    len = 10;    len = 10;
3686    overlay_vec = (Lisp_Object *) xmalloc (len * sizeof (Lisp_Object));    overlay_vec = (Lisp_Object *) xmalloc (len * sizeof (Lisp_Object));
# Line 3710  If there are no more overlay boundaries Line 3710  If there are no more overlay boundaries
3710    int len;    int len;
3711    int i;    int i;
3712    
3713    CHECK_NUMBER_COERCE_MARKER (pos, 0);    CHECK_NUMBER_COERCE_MARKER (pos);
3714    
3715    len = 10;    len = 10;
3716    overlay_vec = (Lisp_Object *) xmalloc (len * sizeof (Lisp_Object));    overlay_vec = (Lisp_Object *) xmalloc (len * sizeof (Lisp_Object));
# Line 3750  If there are no more overlay boundaries Line 3750  If there are no more overlay boundaries
3750    Lisp_Object *overlay_vec;    Lisp_Object *overlay_vec;
3751    int len;    int len;
3752    
3753    CHECK_NUMBER_COERCE_MARKER (pos, 0);    CHECK_NUMBER_COERCE_MARKER (pos);
3754    
3755    /* At beginning of buffer, we know the answer;    /* At beginning of buffer, we know the answer;
3756       avoid bug subtracting 1 below.  */       avoid bug subtracting 1 below.  */
# Line 3797  DEFUN ("overlay-recenter", Foverlay_rece Line 3797  DEFUN ("overlay-recenter", Foverlay_rece
3797       (pos)       (pos)
3798       Lisp_Object pos;       Lisp_Object pos;
3799  {  {
3800    CHECK_NUMBER_COERCE_MARKER (pos, 0);    CHECK_NUMBER_COERCE_MARKER (pos);
3801    
3802    recenter_overlay_lists (current_buffer, XINT (pos));    recenter_overlay_lists (current_buffer, XINT (pos));
3803    return Qnil;    return Qnil;
# Line 3810  DEFUN ("overlay-get", Foverlay_get, Sove Line 3810  DEFUN ("overlay-get", Foverlay_get, Sove
3810  {  {
3811    Lisp_Object plist, fallback;    Lisp_Object plist, fallback;
3812    
3813    CHECK_OVERLAY (overlay, 0);    CHECK_OVERLAY (overlay);
3814    
3815    fallback = Qnil;    fallback = Qnil;
3816    
# Line 3840  DEFUN ("overlay-put", Foverlay_put, Sove Line 3840  DEFUN ("overlay-put", Foverlay_put, Sove
3840    Lisp_Object tail, buffer;    Lisp_Object tail, buffer;
3841    int changed;    int changed;
3842    
3843    CHECK_OVERLAY (overlay, 0);    CHECK_OVERLAY (overlay);
3844    
3845    buffer = Fmarker_buffer (OVERLAY_START (overlay));    buffer = Fmarker_buffer (OVERLAY_START (overlay));
3846    

Legend:
Removed from v.1.368  
changed lines
  Added in v.1.369

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26