emacs: src/buffer.c comparison

comparison src/buffer.c @ 91041:bdb3fe0ba9fa

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 866-879) - Merge multi-tty branch - Update from CVS - Merge from emacs--rel--22 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-257

author	Miles Bader <miles@gnu.org>
date	Thu, 11 Oct 2007 16:22:07 +0000
parents	539530fa389c 5039706521c9
children	a0e466c4d599

comparison

equal deleted inserted replaced

-:14c4a6aac623
+:bdb3fe0ba9fa
 in the proper order for that frame: the buffers in FRAME's `buffer-list'
 frame parameter come first, followed by the rest of the buffers.  */)
 (frame)
 Lisp_Object frame;
 {
-Lisp_Object framelist, general;
+Lisp_Object general;
 general = Fmapcar (Qcdr, Vbuffer_alist);
 if (FRAMEP (frame))
 {
-Lisp_Object tail;
+Lisp_Object framelist, prevlist, tail;
+Lisp_Object args[3];
 CHECK_FRAME (frame);
 framelist = Fcopy_sequence (XFRAME (frame)->buffer_list);
+prevlist = Fnreverse (Fcopy_sequence (XFRAME (frame)->buried_buffer_list));
-/* Remove from GENERAL any buffer that duplicates one in FRAMELIST.  */
+/* Remove from GENERAL any buffer that duplicates one in
+FRAMELIST or PREVLIST.  */
 tail = framelist;
-while (! NILP (tail))
+while (CONSP (tail))
 	{
 	  general = Fdelq (XCAR (tail), general);
 	  tail = XCDR (tail);
 	}
-return nconc2 (framelist, general);
+tail = prevlist;
+while (CONSP (tail))
+	{
+	  general = Fdelq (XCAR (tail), general);
+	  tail = XCDR (tail);
+	}
+args[0] = framelist;
+args[1] = general;
+args[2] = prevlist;
+return Fnconc (3, args);
 }
 return general;
 }
 b->mark = Fmake_marker ();
 BUF_MARKERS (b) = NULL;
 b->name = name;
 /* Put this in the alist of all live buffers.  */
+XSETPVECTYPE (b, PVEC_BUFFER);
 XSETBUFFER (buf, b);
 Vbuffer_alist = nconc2 (Vbuffer_alist, Fcons (Fcons (name, buf), Qnil));
 /* An error in calling the function here (should someone redefine it)
 can lead to infinite regress until you run out of stack.  rms
 XSETCDR (prev, XCDR (XCDR (prev)));
 XSETCDR (link, Vbuffer_alist);
 Vbuffer_alist = link;
+/* Effectively do a delq on buried_buffer_list.  */
+prev = Qnil;
+for (link = XFRAME (frame)->buried_buffer_list; CONSP (link);
+link = XCDR (link))
+{
+if (EQ (XCAR (link), buf))
+{
+if (NILP (prev))
+XFRAME (frame)->buried_buffer_list = XCDR (link);
+else
+XSETCDR (prev, XCDR (XCDR (prev)));
+break;
+}
+prev = link;
+}
 /* Now move this buffer to the front of frame_buffer_list also.  */
 prev = Qnil;
 for (link = frame_buffer_list (frame); CONSP (link);
 link = XCDR (link))
 link = Fmemq (aelt, Vbuffer_alist);
 Vbuffer_alist = Fdelq (aelt, Vbuffer_alist);
 XSETCDR (link, Qnil);
 Vbuffer_alist = nconc2 (Vbuffer_alist, link);
-/* Removing BUFFER from frame-specific lists
+XFRAME (selected_frame)->buffer_list
-	 has the effect of putting BUFFER at the end
+= Fdelq (buffer, XFRAME (selected_frame)->buffer_list);
-	 of the combined list in each frame.  */
+XFRAME (selected_frame)->buried_buffer_list
-frames_discard_buffer (buffer);
+= Fcons (buffer, Fdelq (buffer, XFRAME (selected_frame)->buried_buffer_list));
 }
 return Qnil;
 }
 return Fcopy_sequence (XOVERLAY (overlay)->plist);
 }
 DEFUN ("overlays-at", Foverlays_at, Soverlays_at, 1, 1, 0,
-doc: /* Return a list of the overlays that contain position POS.  */)
+doc: /* Return a list of the overlays that contain the character at POS.  */)
 (pos)
 Lisp_Object pos;
 {
 int noverlays;
 Lisp_Object *overlay_vec;
 /* Prevent GC from getting confused.  */
 buffer_defaults.text = &buffer_defaults.own_text;
 buffer_local_symbols.text = &buffer_local_symbols.own_text;
 BUF_INTERVALS (&buffer_defaults) = 0;
 BUF_INTERVALS (&buffer_local_symbols) = 0;
+XSETPVECTYPE (&buffer_defaults, PVEC_BUFFER);
 XSETBUFFER (Vbuffer_defaults, &buffer_defaults);
+XSETPVECTYPE (&buffer_local_symbols, PVEC_BUFFER);
 XSETBUFFER (Vbuffer_local_symbols, &buffer_local_symbols);
 /* Set up the default values of various buffer slots.  */
 /* Must do these before making the first buffer! */
 temp = get_minibuffer (0);
 XBUFFER (temp)->directory = current_buffer->directory;
 free (pwd);
 }
+/* Similar to defvar_lisp but define a variable whose value is the Lisp
+Object stored in the current buffer.  address is the address of the slot
+in the buffer that is current now. */
+/* TYPE is nil for a general Lisp variable.
+An integer specifies a type; then only LIsp values
+with that type code are allowed (except that nil is allowed too).
+LNAME is the LIsp-level variable name.
+VNAME is the name of the buffer slot.
+DOC is a dummy where you write the doc string as a comment.  */
+#define DEFVAR_PER_BUFFER(lname, vname, type, doc)  \
+defvar_per_buffer (lname, vname, type, 0)
+static void
+defvar_per_buffer (namestring, address, type, doc)
+char *namestring;
+Lisp_Object *address;
+Lisp_Object type;
+char *doc;
+{
+Lisp_Object sym, val;
+int offset;
+sym = intern (namestring);
+val = allocate_misc ();
+offset = (char *)address - (char *)current_buffer;
+XMISCTYPE (val) = Lisp_Misc_Buffer_Objfwd;
+XBUFFER_OBJFWD (val)->offset = offset;
+SET_SYMBOL_VALUE (sym, val);
+PER_BUFFER_SYMBOL (offset) = sym;
+PER_BUFFER_TYPE (offset) = type;
+if (PER_BUFFER_IDX (offset) == 0)
+/* Did a DEFVAR_PER_BUFFER without initializing the corresponding
+slot of buffer_local_flags */
+abort ();
+}
 /* initialize the buffer routines */
 void
 syms_of_buffer ()
 {
 DEFVAR_PER_BUFFER ("mode-name", &current_buffer->mode_name,
 Qnil,
 		     doc: /* Pretty name of current buffer's major mode (a string).  */);
+DEFVAR_PER_BUFFER ("local-abbrev-table", &current_buffer->abbrev_table, Qnil,
+		     doc: /* Local (mode-specific) abbrev table of current buffer.  */);
 DEFVAR_PER_BUFFER ("abbrev-mode", &current_buffer->abbrev_mode, Qnil,
 		     doc: /* Non-nil turns on automatic expansion of abbrevs as they are inserted.  */);
 DEFVAR_PER_BUFFER ("case-fold-search", &current_buffer->case_fold_search,
 		     Qnil,

Mercurial > emacs

comparison src/buffer.c @ 91041:bdb3fe0ba9fa