diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-07-19 07:39:38 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-07-19 07:39:38 -0400 |
| commit | 5db81e33629049da22e7d0ff6c28a5cae31edac9 (patch) | |
| tree | a30274d3c351832f8ed0baacd2d178bd0e0fe93c /src | |
| parent | 5b835e1d6e0c6fafc7f27174889358bfde5f2449 (diff) | |
| download | emacs-5db81e33629049da22e7d0ff6c28a5cae31edac9.tar.gz | |
* lisp/emacs-lisp/chart.el: Use lexical-binding.
(chart-emacs-storage): Don't hardcode the list of entries.
* src/alloc.c (Fgarbage_collect): Tweak docstring.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/alloc.c | 19 | ||||
| -rw-r--r-- | src/xmenu.c | 14 |
3 files changed, 18 insertions, 19 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 517d61c4e40..8a60e0bdabe 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-07-19 Stefan Monnier <monnier@iro.umontreal.ca> + + * alloc.c (Fgarbage_collect): Tweak docstring. + 2012-07-19 Dmitry Antipov <dmantipov@yandex.ru> Tweak the value returned from Fgarbage_collect again. diff --git a/src/alloc.c b/src/alloc.c index c52b0475352..d24787576e9 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -5378,17 +5378,14 @@ DEFUN ("garbage-collect", Fgarbage_collect, Sgarbage_collect, 0, 0, "", doc: /* Reclaim storage for Lisp objects no longer needed. Garbage collection happens automatically if you cons more than `gc-cons-threshold' bytes of Lisp data since previous garbage collection. -`garbage-collect' normally returns a list with info on amount of space in use: - ((CONS INTERNAL-SIZE USED-CONSES FREE-CONSES) - (SYMBOL INTERNAL-SIZE USED-SYMBOLS FREE-SYMBOLS) - (MISC INTERNAL-SIZE USED-MISCS FREE-MISCS) - (STRING INTERNAL-SIZE USED-STRINGS FREE-STRING) - (STRING-BYTES 1 USED-STRING-BYTES) - (VECTOR INTERNAL-SIZE USED-VECTORS) - (VECTOR-SLOTS INTERNAL-SIZE USED-VECTOR-SLOTS FREE-VECTOR-SLOTS) - (FLOAT INTERNAL-SIZE USED-FLOATS FREE-FLOATS) - (INTERVAL INTERNAL-SIZE USED-INTERVALS FREE-INTERVALS) - (BUFFER INTERNAL-SIZE USED-BUFFERS)) +`garbage-collect' normally returns a list with info on amount of space in use, +where each entry has the form (NAME SIZE USED FREE), where: +- NAME is a symbol describing the kind of objects this entry represents, +- SIZE is the number of bytes used by each one, +- USED is the number of those objects that were found live in the heap, +- FREE is the number of those objects that are not live but that Emacs + keeps around for future allocations (maybe because it does not know how + to return them to the OS). However, if there was overflow in pure space, `garbage-collect' returns nil, because real GC can't be done. See Info node `(elisp)Garbage Collection'. */) diff --git a/src/xmenu.c b/src/xmenu.c index 61e3e3632b0..c7ec3dc3171 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -679,19 +679,17 @@ popup_activate_callback (Widget widget, LWLIB_ID id, XtPointer client_data) /* This callback is invoked when a dialog or menu is finished being used and has been unposted. */ -#ifdef USE_GTK static void -popup_deactivate_callback (GtkWidget *widget, gpointer client_data) -{ - popup_activated_flag = 0; -} +popup_deactivate_callback ( +#ifdef USE_GTK + GtkWidget *widget, gpointer client_data #else -static void -popup_deactivate_callback (Widget widget, LWLIB_ID id, XtPointer client_data) + Widget widget, LWLIB_ID id, XtPointer client_data +#endif + ) { popup_activated_flag = 0; } -#endif /* Function that finds the frame for WIDGET and shows the HELP text |