comparison src/buffer.c @ 5922:4b055de36bb9 cygwin

merging heads 2
author Henry Thompson <ht@markup.co.uk>
date Fri, 27 Feb 2015 17:47:15 +0000
parents 8139bdf8db04
children bd4d2c8ef9cc e2fae7783046
comparison
equal deleted inserted replaced
5921:68639fb08af8 5922:4b055de36bb9
634 note_object_created (buf); 634 note_object_created (buf);
635 635
636 init_buffer_markers (b); 636 init_buffer_markers (b);
637 init_buffer_syntax_cache (b); 637 init_buffer_syntax_cache (b);
638 638
639 b->generated_modeline_string = Fmake_string (make_fixnum (84), make_fixnum (' ')); 639 b->generated_modeline_string = Fmake_string (make_fixnum (84),
640 make_char (' '));
640 b->modeline_extent_table = make_lisp_hash_table (20, HASH_TABLE_KEY_WEAK, 641 b->modeline_extent_table = make_lisp_hash_table (20, HASH_TABLE_KEY_WEAK,
641 Qeq); 642 Qeq);
642 643
643 644
644 return buf; 645 return buf;
2500 Non-nil turns on automatic expansion of abbrevs as they are inserted. 2501 Non-nil turns on automatic expansion of abbrevs as they are inserted.
2501 Automatically becomes buffer-local when set in any fashion. 2502 Automatically becomes buffer-local when set in any fashion.
2502 */ ); 2503 */ );
2503 2504
2504 DEFVAR_BUFFER_LOCAL ("case-fold-search", case_fold_search /* 2505 DEFVAR_BUFFER_LOCAL ("case-fold-search", case_fold_search /*
2505 *Non-nil if searches should ignore case. 2506 *If non-nil, searches and matches should ignore case.
2506 Automatically becomes buffer-local when set in any fashion. 2507 Automatically becomes buffer-local when set in any fashion.
2507 */ ); 2508 */ );
2508 2509
2509 DEFVAR_BUFFER_LOCAL ("fill-column", fill_column /* 2510 DEFVAR_BUFFER_LOCAL ("fill-column", fill_column /*
2510 *Column beyond which automatic line-wrapping should happen. 2511 *Column beyond which automatic line-wrapping should happen.