diff options
| author | Paul Eggert | 2015-01-05 09:07:45 -0800 |
|---|---|---|
| committer | Paul Eggert | 2015-01-05 10:14:58 -0800 |
| commit | 58f2d6ef32b28a787fcc4e0d98b3f331ceb2a68c (patch) | |
| tree | d6d79ad7b7cceafc78c5a9c54f5be1ac441a8ed7 /src/window.c | |
| parent | d2cf05d1bac19d8564d0806f515b9f40fe57f4df (diff) | |
| download | emacs-58f2d6ef32b28a787fcc4e0d98b3f331ceb2a68c.tar.gz emacs-58f2d6ef32b28a787fcc4e0d98b3f331ceb2a68c.zip | |
Compute C decls for DEFSYMs automatically
Fixes Bug#15880.
This patch also makes Q constants (e.g., Qnil) constant addresses
from the C point of view.
* make-docfile.c: Revamp to generate table of symbols, too.
Include <stdbool.h>.
(xstrdup): New function.
(main): Don't process the same file twice.
(SYMBOL): New constant in enum global_type.
(struct symbol): Turn 'value' member into a union, either v.value
for int or v.svalue for string. All uses changed.
(add_global): New arg svalue, which overrides value, so that globals
can have a string value.
(close_emacs_global): New arg num_symbols; all uses changed.
Output lispsym decl.
(write_globals): Output symbol globals too. Output more
ATTRIBUTE_CONST, now that Qnil etc. are C constants.
Output defsym_name table.
(scan_c_file): Move most of guts into ...
(scan_c_stream): ... new function. Scan for DEFSYMs and
record symbols found. Don't read past EOF if file doesn't
end in newline.
* alloc.c, bidi.c, buffer.c, bytecode.c, callint.c, casefiddle:
* casetab.c, category.c, ccl.c, charset.c, chartab.c, cmds.c, coding.c:
* composite.c, data.c, dbusbind.c, decompress.c, dired.c, dispnew.c:
* doc.c, editfns.c, emacs.c, eval.c, fileio.c, fns.c, font.c, fontset.c:
* frame.c, fringe.c, ftfont.c, ftxfont.c, gfilenotify.c, gnutls.c:
* image.c, inotify.c, insdel.c, keyboard.c, keymap.c, lread.c:
* macfont.m, macros.c, minibuf.c, nsfns.m, nsfont.m, nsimage.m:
* nsmenu.m, nsselect.m, nsterm.m, print.c, process.c, profiler.c:
* search.c, sound.c, syntax.c, term.c, terminal.c, textprop.c, undo.c:
* window.c, xdisp.c, xfaces.c, xfns.c, xftfont.c, xmenu.c, xml.c:
* xselect.c, xsettings.c, xterm.c:
Remove Q vars that represent symbols (e.g., Qnil, Qt, Qemacs).
These names are now defined automatically by make-docfile.
* alloc.c (init_symbol): New function.
(Fmake_symbol): Use it.
(c_symbol_p): New function.
(valid_lisp_object_p, purecopy): Use it.
* alloc.c (marked_pinned_symbols):
Use make_lisp_symbol instead of make_lisp_ptr.
(garbage_collect_1): Mark lispsym symbols.
(CHECK_ALLOCATED_AND_LIVE_SYMBOL): New macro.
(mark_object): Use it.
(sweep_symbols): Sweep lispsym symbols.
(symbol_uses_obj): New function.
(which_symbols): Use it. Work for lispsym symbols, too.
(init_alloc_once): Initialize Vpurify_flag here; no need to wait,
since Qt's address is already known now.
(syms_of_alloc): Add lispsym count to symbols_consed.
* buffer.c (init_buffer_once): Compare to Qnil, not to make_number (0),
when testing whether storage is all bits zero.
* dispextern (struct image_type):
* font.c (font_property_table):
* frame.c (struct frame_parm_table, frame_parms):
* keyboard.c (scroll_bar_parts, struct event_head):
* xdisp.c (struct props):
Use XSYMBOL_INIT (Qfoo) and struct Lisp_Symbol * rather than &Qfoo and
Lisp_Object *, since Qfoo is no longer an object whose address can be
taken. All uses changed.
* eval.c (run_hook): New function. Most uses of Frun_hooks changed to
use it, so that they no longer need to take the address of a Lisp sym.
(syms_of_eval): Don't use DEFSYM on Vrun_hooks, as it's a variable.
* frame.c (syms_of_frame): Add defsyms for the frame_parms table.
* keyboard.c (syms_of_keyboard): Don't DEFSYM Qmenu_bar here.
DEFSYM Qdeactivate_mark before the corresponding var.
* keymap.c (syms_of_keymap): Use DEFSYM for Qmenu_bar and Qmode_line
instead of interning their symbols; this avoids duplicates.
(LISP_INITIALLY, TAG_PTR)
(DEFINE_LISP_SYMBOL_BEGIN, DEFINE_LISP_SYMBOL_END, XSYMBOL_INIT):
New macros.
(LISP_INITIALLY_ZERO): Use it.
(enum symbol_interned, enum symbol_redirect, struct Lisp_Symbol)
(EXFUN, DEFUN_ARGS_MANY, DEFUN_ARGS_UNEVALLED, DEFUN_ARGS_*):
Move decls up, to avoid forward uses. Include globals.h earlier, too.
(make_lisp_symbol): New function.
(XSETSYMBOL): Use it.
(DEFSYM): Now just a placeholder for make-docfile.
* lread.c (DEFINE_SYMBOLS): Define, for globals.h.
(intern_sym): New function, with body taken from old intern_driver.
(intern_driver): Use it. Last arg is now Lisp integer, not ptrdiff_t.
All uses changed.
(define_symbol): New function.
(init_obarray): Define the C symbols taken from lispsym.
Use plain DEFSYM for Qt and Qnil.
* syntax.c (init_syntax_once): No need to worry about
Qchar_table_extra_slots.
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/src/window.c b/src/window.c index 45dfb9ea1c2..b508988953f 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -45,20 +45,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 45 | #include "msdos.h" | 45 | #include "msdos.h" |
| 46 | #endif | 46 | #endif |
| 47 | 47 | ||
| 48 | Lisp_Object Qwindowp, Qwindow_live_p; | ||
| 49 | static Lisp_Object Qwindow_valid_p; | ||
| 50 | static Lisp_Object Qwindow_configuration_p; | ||
| 51 | static Lisp_Object Qrecord_window_buffer; | ||
| 52 | static Lisp_Object Qwindow_deletable_p, Qdelete_window, Qdisplay_buffer; | ||
| 53 | static Lisp_Object Qreplace_buffer_in_windows, Qget_mru_window; | ||
| 54 | static Lisp_Object Qwindow_resize_root_window, Qwindow_resize_root_window_vertically; | ||
| 55 | static Lisp_Object Qwindow_sanitize_window_sizes; | ||
| 56 | static Lisp_Object Qwindow_pixel_to_total; | ||
| 57 | static Lisp_Object Qscroll_up, Qscroll_down, Qscroll_command; | ||
| 58 | static Lisp_Object Qsafe, Qabove, Qbelow, Qwindow_size, Qclone_of; | ||
| 59 | static Lisp_Object Qfloor, Qceiling; | ||
| 60 | static Lisp_Object Qwindow_point_insertion_type; | ||
| 61 | |||
| 62 | static int displayed_window_lines (struct window *); | 48 | static int displayed_window_lines (struct window *); |
| 63 | static int count_windows (struct window *); | 49 | static int count_windows (struct window *); |
| 64 | static int get_leaf_windows (struct window *, struct window **, int); | 50 | static int get_leaf_windows (struct window *, struct window **, int); |
| @@ -115,15 +101,9 @@ Lisp_Object minibuf_window; | |||
| 115 | shown as the selected window when the minibuffer is selected. */ | 101 | shown as the selected window when the minibuffer is selected. */ |
| 116 | Lisp_Object minibuf_selected_window; | 102 | Lisp_Object minibuf_selected_window; |
| 117 | 103 | ||
| 118 | /* Hook run at end of temp_output_buffer_show. */ | ||
| 119 | static Lisp_Object Qtemp_buffer_show_hook; | ||
| 120 | |||
| 121 | /* Incremented for each window created. */ | 104 | /* Incremented for each window created. */ |
| 122 | static int sequence_number; | 105 | static int sequence_number; |
| 123 | 106 | ||
| 124 | /* Hook to run when window config changes. */ | ||
| 125 | static Lisp_Object Qwindow_configuration_change_hook; | ||
| 126 | |||
| 127 | /* Used by the function window_scroll_pixel_based. */ | 107 | /* Used by the function window_scroll_pixel_based. */ |
| 128 | static int window_scroll_pixel_based_preserve_x; | 108 | static int window_scroll_pixel_based_preserve_x; |
| 129 | static int window_scroll_pixel_based_preserve_y; | 109 | static int window_scroll_pixel_based_preserve_y; |
| @@ -3653,7 +3633,7 @@ temp_output_buffer_show (register Lisp_Object buf) | |||
| 3653 | record_unwind_protect (select_window_norecord, prev_window); | 3633 | record_unwind_protect (select_window_norecord, prev_window); |
| 3654 | Fselect_window (window, Qt); | 3634 | Fselect_window (window, Qt); |
| 3655 | Fset_buffer (w->contents); | 3635 | Fset_buffer (w->contents); |
| 3656 | Frun_hooks (1, &Qtemp_buffer_show_hook); | 3636 | run_hook (Qtemp_buffer_show_hook); |
| 3657 | unbind_to (count, Qnil); | 3637 | unbind_to (count, Qnil); |
| 3658 | } | 3638 | } |
| 3659 | } | 3639 | } |