comparison src/buffer.c @ 43712:223f1f5d160d

(syms_of_buffer): Allow non-string `mode-name'.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 04 Mar 2002 23:20:06 +0000
parents a4789f07d85d
children c54f8a37564e
comparison
equal deleted inserted replaced
43711:d15360503e4e 43712:223f1f5d160d
1551 { 1551 {
1552 Lisp_Object tem; 1552 Lisp_Object tem;
1553 if (EQ (minibuf_window, window)) 1553 if (EQ (minibuf_window, window))
1554 return "Cannot switch buffers in minibuffer window"; 1554 return "Cannot switch buffers in minibuffer window";
1555 tem = Fwindow_dedicated_p (window); 1555 tem = Fwindow_dedicated_p (window);
1556 if (!NILP (tem)) 1556 if (EQ (tem, Qt))
1557 return "Cannot switch buffers in a dedicated window"; 1557 return "Cannot switch buffers in a dedicated window";
1558 return NULL; 1558 return NULL;
1559 } 1559 }
1560 1560
1561 /* Switch to buffer BUFFER in the selected window. 1561 /* Switch to buffer BUFFER in the selected window.
5224 DEFVAR_PER_BUFFER ("major-mode", &current_buffer->major_mode, 5224 DEFVAR_PER_BUFFER ("major-mode", &current_buffer->major_mode,
5225 make_number (Lisp_Symbol), 5225 make_number (Lisp_Symbol),
5226 doc: /* Symbol for current buffer's major mode. */); 5226 doc: /* Symbol for current buffer's major mode. */);
5227 5227
5228 DEFVAR_PER_BUFFER ("mode-name", &current_buffer->mode_name, 5228 DEFVAR_PER_BUFFER ("mode-name", &current_buffer->mode_name,
5229 make_number (Lisp_String), 5229 Qnil,
5230 doc: /* Pretty name of current buffer's major mode (a string). */); 5230 doc: /* Pretty name of current buffer's major mode (a string). */);
5231 5231
5232 DEFVAR_PER_BUFFER ("abbrev-mode", &current_buffer->abbrev_mode, Qnil, 5232 DEFVAR_PER_BUFFER ("abbrev-mode", &current_buffer->abbrev_mode, Qnil,
5233 doc: /* Non-nil turns on automatic expansion of abbrevs as they are inserted. */); 5233 doc: /* Non-nil turns on automatic expansion of abbrevs as they are inserted. */);
5234 5234