xemacs-beta: src/buffer.c comparison

comparison src/buffer.c @ 444:576fb035e263 r21-2-37

Import from CVS: tag r21-2-37

author	cvs
date	Mon, 13 Aug 2007 11:36:19 +0200
parents	abe6d1db359e
children	1ccc32a20af4

comparison

equal deleted inserted replaced

-:a8296e22da4e
+:576fb035e263
 }
 #endif /* FSFmacs */
 DEFUN ("get-buffer", Fget_buffer, 1, 1, 0, /*
-Return the buffer named NAME (a string).
+Return the buffer named BUFFER-NAME (a string), or nil if there is none.
-If there is no live buffer named NAME, return nil.
+BUFFER-NAME may also be a buffer; if so, the value is that buffer.
-NAME may also be a buffer; if so, the value is that buffer.
+*/
-*/
+(buffer_name))
-(name))
 {
 #ifdef I18N3
 /* #### Doc string should indicate that the buffer name will get
 translated. */
 #endif
 /* #### This might return a dead buffer.  This is gross.  This is
 called FSF compatibility. */
-if (BUFFERP (name))
+if (BUFFERP (buffer_name))
-return name;
+return buffer_name;
-return get_buffer (name, 0);
+return get_buffer (buffer_name, 0);
 /* FSFmacs 19.29 calls assoc_ignore_text_properties() here.
 Bleagh!! */
 }
 return finish_init_buffer (b, name);
 }
 DEFUN ("make-indirect-buffer", Fmake_indirect_buffer, 2, 2,
 "bMake indirect buffer (to buffer): \nBName of indirect buffer: ", /*
-Create and return an indirect buffer for buffer BASE, named NAME.
+Create and return an indirect buffer for buffer BASE-BUFFER, named NAME.
-BASE should be an existing buffer (or buffer name).
+BASE-BUFFER should be an existing buffer (or buffer name).
 NAME should be a string which is not the name of an existing buffer.
-If BASE is an indirect buffer itself, the base buffer for that buffer
+If BASE-BUFFER is itself an indirect buffer, the base buffer for that buffer
 is made the base buffer for the newly created buffer. (Thus, there will
 never be indirect buffers whose base buffers are themselves indirect.)
 */
 (base_buffer, name))
 {
 /* This is often called when the buffer contents are altered but we
 don't want to treat the changes that way (e.g. selective
 display).  We still need to make sure redisplay realizes that the
 contents have potentially altered and it needs to do some
 work. */
-buf = decode_buffer(buffer, 0);
+buf = decode_buffer (buffer, 0);
 BUF_MODIFF (buf)++;
 BUF_SAVE_MODIFF (buf) = NILP (flag) ? BUF_MODIFF (buf) : 0;
 MARK_MODELINE_CHANGED;
 return flag;
 return notsogood;
 return Fget_buffer_create (QSscratch);
 }
 DEFUN ("buffer-disable-undo", Fbuffer_disable_undo, 0, 1, "", /*
-Make BUFFER stop keeping undo information.
+Stop keeping undo information for BUFFER.
 Any undo records it already has are discarded.
 No argument or nil as argument means do this for the current buffer.
 */
 (buffer))
 {
 real_buf->undo_list = Qt;
 return Qnil;
 }
 DEFUN ("buffer-enable-undo", Fbuffer_enable_undo, 0, 1, "", /*
-Start keeping undo information for buffer BUFFER.
+Start keeping undo information for BUFFER.
 No argument or nil as argument means do this for the current buffer.
 */
 (buffer))
 {
 /* Allowing nil is an RMSism */
 delete_from_buffer_alist (buf);
 /* #### This is a problem if this buffer is in a dedicated window.
 Need to undedicate any windows of this buffer first (and delete them?)
 */
-Freplace_buffer_in_windows (buf);
+Freplace_buffer_in_windows (buf, Qnil, Qnil);
 font_lock_buffer_was_killed (b);
 /* Delete any auto-save file, if we saved it in this session.  */
 if (STRINGP (b->auto_save_file_name)
 return buffer;
 }
 DEFUN ("barf-if-buffer-read-only", Fbarf_if_buffer_read_only, 0, 3, 0, /*
-Signal a `buffer-read-only' error if the buffer is read-only.
+Signal a `buffer-read-only' error if BUFFER is read-only.
 Optional argument BUFFER defaults to the current buffer.
 If optional argument START is non-nil, all extents in the buffer
 which overlap that part of the buffer are checked to ensure none has a
 `read-only' property. (Extents that lie completely within the range,
 unbind_to (count, Qnil);
 if (sink_type != DFC_TYPE_LISP_LSTREAM)
 {
 sink->data.len = Dynarr_length (conversion_out_dynarr);
-Dynarr_add (conversion_out_dynarr, 0);
+Dynarr_add (conversion_out_dynarr, '\0');	/* NUL-terminate! */
 sink->data.ptr = Dynarr_atp (conversion_out_dynarr, 0);
 }
 }
 void
 Bytecount len = source->data.len;
 const Bufbyte *end = ptr + len;
 for (; ptr < end; ptr++)
 {
-Extbyte c = *ptr;
+Bufbyte c = *ptr;
 	  if (BYTE_ASCII_P (c))
 	    Dynarr_add (conversion_in_dynarr, c);
 	  else if (BYTE_C1_P (c))
 	    {
 unbind_to (count, Qnil);
 if (sink_type != DFC_TYPE_LISP_LSTREAM)
 {
 sink->data.len = Dynarr_length (conversion_in_dynarr);
-Dynarr_add (conversion_in_dynarr, 0); /* remember to zero-terminate! */
+Dynarr_add (conversion_in_dynarr, '\0'); /* NUL-terminate! */
 sink->data.ptr = Dynarr_atp (conversion_in_dynarr, 0);
 }
 }
 the read-only state of the buffer.  See also `kill-all-local-variables'.
 */ );
 Vchange_major_mode_hook = Qnil;
 DEFVAR_BOOL ("find-file-compare-truenames", &find_file_compare_truenames /*
-If this is true, then the find-file command will check the truenames
+If this is true, then the `find-file' command will check the truenames
 of all visited files when deciding whether a given file is already in
-a buffer, instead of just the buffer-file-name.  This means that if you
+a buffer, instead of just `buffer-file-name'.  This means that if you
-attempt to visit another file which is a symbolic-link to a file which is
+attempt to visit another file which is a symbolic link to a file which
-already in a buffer, the existing buffer will be found instead of a newly-
+is already in a buffer, the existing buffer will be found instead of a
-created one.  This works if any component of the pathname (including a non-
+newly-created one.  This works if any component of the pathname
-terminal component) is a symbolic link as well, but doesn't work with hard
+(including a non-terminal component) is a symbolic link as well, but
-links (nothing does).
+doesn't work with hard links (nothing does).
-See also the variable find-file-use-truenames.
+See also the variable `find-file-use-truenames'.
 */ );
 find_file_compare_truenames = 0;
 DEFVAR_BOOL ("find-file-use-truenames", &find_file_use_truenames /*
 If this is true, then a buffer's visited file-name will always be
 chased back to the real file; it will never be a symbolic link, and there
 will never be a symbolic link anywhere in its directory path.
 That is, the buffer-file-name and buffer-file-truename will be equal.
 This doesn't work with hard links.
-See also the variable find-file-compare-truenames.
+See also the variable `find-file-compare-truenames'.
 */ );
 find_file_use_truenames = 0;
 DEFVAR_LISP ("before-change-functions", &Vbefore_change_functions /*
 List of functions to call before each text change.
 DEFVAR_BUFFER_LOCAL ("buffer-undo-list", undo_list /*
 List of undo entries in current buffer.
 Recent changes come first; older changes follow newer.
-An entry (BEG . END) represents an insertion which begins at
+An entry (START . END) represents an insertion which begins at
-position BEG and ends at position END.
+position START and ends at position END.
 An entry (TEXT . POSITION) represents the deletion of the string TEXT
 from (abs POSITION).  If POSITION is positive, point was at the front
 of the text being deleted; if negative, point was at the end.
 Invisibility spec of this buffer.
 The default is t, which means that text is invisible
 if it has (or is covered by an extent with) a non-nil `invisible' property.
 If the value is a list, a text character is invisible if its `invisible'
 property is an element in that list.
-If an element is a cons cell of the form (PROP . ELLIPSIS),
+If an element is a cons cell of the form (PROPERTY . ELLIPSIS),
-then characters with property value PROP are invisible,
+then characters with property value PROPERTY are invisible,
 and they have an ellipsis as well if ELLIPSIS is non-nil.
 Note that the actual characters used for the ellipsis are controllable
 using `invisible-text-glyph', and default to "...".
 */, redisplay_variable_changed);

Mercurial > hg > xemacs-beta

comparison src/buffer.c @ 444:576fb035e263 r21-2-37