Mercurial > emacs
changeset 109644:5644ada142e1
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Tue, 03 Aug 2010 22:49:16 +0000 |
| parents | 50d12d998e76 (current diff) 2c821d4f47fe (diff) |
| children | cead5360b522 |
| files | |
| diffstat | 6 files changed, 25 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Aug 02 22:48:42 2010 +0000 +++ b/lisp/ChangeLog Tue Aug 03 22:49:16 2010 +0000 @@ -1,3 +1,7 @@ +2010-08-03 Leo <sdl.web@gmail.com> + + * server.el (server-start): Simplify loop. + 2010-08-02 Stefan Monnier <monnier@iro.umontreal.ca> * frame.el (screen-height, screen-width, set-screen-width)
--- a/lisp/server.el Mon Aug 02 22:48:42 2010 +0000 +++ b/lisp/server.el Tue Aug 03 22:49:16 2010 +0000 @@ -577,7 +577,7 @@ (loop ;; The auth key is a 64-byte string of random chars in the ;; range `!'..`~'. - for i below 64 + repeat 64 collect (+ 33 (random 94)) into auth finally return (concat auth)))) (process-put server-process :auth-key auth-key)
--- a/nt/ChangeLog Mon Aug 02 22:48:42 2010 +0000 +++ b/nt/ChangeLog Tue Aug 03 22:49:16 2010 +0000 @@ -1,3 +1,8 @@ +2010-08-02 Juanma Barranquero <lekktu@gmail.com> + + * config.nt (TIME_WITH_SYS_TIME): Remove #undef, unused (bug#6754). + Suggested by Dan Nicolaescu <dann@ics.uci.edu>. + 2010-07-29 Dan Nicolaescu <dann@ics.uci.edu> * config.nt: Remove code referring to NO_REMAP, unused.
--- a/nt/config.nt Mon Aug 02 22:48:42 2010 +0000 +++ b/nt/config.nt Tue Aug 03 22:49:16 2010 +0000 @@ -138,7 +138,6 @@ #undef HAVE_STDLIB_H #undef HAVE_PWD_H #undef STDC_HEADERS -#undef TIME_WITH_SYS_TIME #undef HAVE_LIBDNET #undef HAVE_LIBPTHREADS
--- a/src/ChangeLog Mon Aug 02 22:48:42 2010 +0000 +++ b/src/ChangeLog Tue Aug 03 22:49:16 2010 +0000 @@ -1,3 +1,8 @@ +2010-08-03 Johan Bockgård <bojohan@gnu.org> + + * data.c (Flocal_variable_p): Handle variable aliases correctly. + (Bug#6744) + 2010-08-02 Jan Djärv <jan.h.d@swipnet.se> * xterm.c (x_create_toolkit_scroll_bar): Only set XtNbeNiceToColormap @@ -5,9 +10,8 @@ * gtkutil.c (hierarchy_ch_cb, qttip_cb): Do not define unless USE_GTK_TOOLTIP. - (xg_prepare_tooltip): Return 0 unless USE_GTK_TOOLTIP - (xg_show_tooltip, xg_hide_tooltip): Do nothing unless - USE_GTK_TOOLTIP. + (xg_prepare_tooltip): Return 0 unless USE_GTK_TOOLTIP. + (xg_show_tooltip, xg_hide_tooltip): Do nothing unless USE_GTK_TOOLTIP. (xg_create_frame_widgets): Surround tooltip-related code with ifdef USE_GTK_TOOLTIP. (xg_free_frame_widgets): Don't delete ttip_* unless USE_GTK_TOOLTIP. @@ -42,8 +46,8 @@ (xg_show_tooltip, xg_hide_tooltip): Declare. * gtkutil.c (hierarchy_ch_cb, qttip_cb, xg_prepare_tooltip) - (xg_show_tooltip, xg_hide_tooltip, xg_free_frame_widgets): New - functions. + (xg_show_tooltip, xg_hide_tooltip, xg_free_frame_widgets): + New functions. (xg_create_frame_widgets): Set ttip_* to 0. Set a dummy tooltip text so qttip_cb is called. Connect query-tooltip to qttip_cb. Remove code that is commented out. @@ -83,9 +87,9 @@ * xfns.c (x_set_tool_bar_position): Remove debug fprintf. * xterm.h (struct x_output): Add toolbar_top_height, - toolbar_bottom_height, toolbar_left_width, toolbar_right_width. Remove - toolbar_height. - if USE_GTK: Add hbox_widget and toolbar_in_hbox. + toolbar_bottom_height, toolbar_left_width, toolbar_right_width. + Remove toolbar_height. + If USE_GTK: Add hbox_widget and toolbar_in_hbox. (FRAME_TOOLBAR_TOP_HEIGHT, FRAME_TOOLBAR_BOTTOM_HEIGHT) (FRAME_TOOLBAR_LEFT_WIDTH, FRAME_TOOLBAR_RIGHT_WIDTH): New macros. (FRAME_TOOLBAR_HEIGHT): Is now TOP_HEIGHT + BOTTOM_HEIGHT. @@ -95,7 +99,7 @@ * xfns.c (x_set_tool_bar_position): New function. (xic_set_statusarea): Use FRAME_TOOLBAR_TOP_HEIGHT. (x_frame_parm_handlers): Add x_set_tool_bar_position. - (syms_of_xfns): if USE_GTK, provide move-toolbar. + (syms_of_xfns): If USE_GTK, provide move-toolbar. * window.c (calc_absolute_offset): Check for FRAME_TOOLBAR_TOP_HEIGHT and FRAME_TOOLBAR_LEFT_WIDTH. @@ -115,8 +119,7 @@ size correctly. Remove hardcoded 4, instead use handlebox size - toolbar size. (xg_tool_bar_attach_callback): Update left/right/top/bottom tool bar - size correctly. Use handlebox size + toolbar size as additional - size. + size correctly. Use handlebox size + toolbar size as additional size. (xg_pack_tool_bar): POS is a new parameter. Set orientation of tool bar based on pos. Only make handlebox_widget if NULL.
--- a/src/data.c Mon Aug 02 22:48:42 2010 +0000 +++ b/src/data.c Tue Aug 03 22:49:16 2010 +0000 @@ -1866,6 +1866,7 @@ Lisp_Object tail, elt, tmp; struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym); XSETBUFFER (tmp, buf); + XSETSYMBOL (variable, sym); /* Update in case of aliasing. */ for (tail = buf->local_var_alist; CONSP (tail); tail = XCDR (tail)) {