------------------------------------------------------------ revno: 117565 committer: Dmitry Antipov branch nick: trunk timestamp: Tue 2014-07-22 17:55:04 +0400 message: * xterm.h (struct x_output) [USE_LUCID && USE_TOOLKIT_SCROLL_BARS]: Define scroll_bar_top_shadow_pixel and scroll_bar_bottom_shadow_pixel as such. All related users changed. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-07-22 10:34:05 +0000 +++ src/ChangeLog 2014-07-22 13:55:04 +0000 @@ -2,6 +2,9 @@ * xterm.h (struct x_output) [USE_X_TOOLKIT || USE_GTK]: Define menubar_height as such. Tweak comment. + [USE_LUCID && USE_TOOLKIT_SCROLL_BARS]: Likewise for + scroll_bar_top_shadow_pixel and scroll_bar_bottom_shadow_pixel. + All related users changed. (FRAME_MENUBAR_HEIGHT) [!USE_X_TOOLKIT && !USE_GTK]: No-op. * xterm.c (handle_one_xevent): * gtkutil.c (xg_event_is_for_menubar): === modified file 'src/xfns.c' --- src/xfns.c 2014-07-22 10:34:05 +0000 +++ src/xfns.c 2014-07-22 13:55:04 +0000 @@ -1221,7 +1221,7 @@ if (f->output_data.x->scroll_bar_background_pixel != -1) unload_color (f, f->output_data.x->scroll_bar_background_pixel); -#ifdef USE_TOOLKIT_SCROLL_BARS +#if defined (USE_LUCID) && defined (USE_TOOLKIT_SCROLL_BARS) /* Scrollbar shadow colors. */ if (f->output_data.x->scroll_bar_top_shadow_pixel != -1) { @@ -1233,7 +1233,7 @@ unload_color (f, f->output_data.x->scroll_bar_bottom_shadow_pixel); f->output_data.x->scroll_bar_bottom_shadow_pixel = -1; } -#endif /* USE_TOOLKIT_SCROLL_BARS */ +#endif /* USE_LUCID && USE_TOOLKIT_SCROLL_BARS */ f->output_data.x->scroll_bar_background_pixel = pixel; if (FRAME_X_WINDOW (f) && FRAME_VISIBLE_P (f)) @@ -2950,10 +2950,10 @@ FRAME_FONTSET (f) = -1; f->output_data.x->scroll_bar_foreground_pixel = -1; f->output_data.x->scroll_bar_background_pixel = -1; -#ifdef USE_TOOLKIT_SCROLL_BARS +#if defined (USE_LUCID) && defined (USE_TOOLKIT_SCROLL_BARS) f->output_data.x->scroll_bar_top_shadow_pixel = -1; f->output_data.x->scroll_bar_bottom_shadow_pixel = -1; -#endif /* USE_TOOLKIT_SCROLL_BARS */ +#endif /* USE_LUCID && USE_TOOLKIT_SCROLL_BARS */ f->output_data.x->white_relief.pixel = -1; f->output_data.x->black_relief.pixel = -1; @@ -4952,10 +4952,10 @@ FRAME_FONTSET (f) = -1; f->output_data.x->scroll_bar_foreground_pixel = -1; f->output_data.x->scroll_bar_background_pixel = -1; -#ifdef USE_TOOLKIT_SCROLL_BARS +#if defined (USE_LUCID) && defined (USE_TOOLKIT_SCROLL_BARS) f->output_data.x->scroll_bar_top_shadow_pixel = -1; f->output_data.x->scroll_bar_bottom_shadow_pixel = -1; -#endif /* USE_TOOLKIT_SCROLL_BARS */ +#endif /* USE_LUCID && USE_TOOLKIT_SCROLL_BARS */ f->output_data.x->white_relief.pixel = -1; f->output_data.x->black_relief.pixel = -1; === modified file 'src/xterm.c' --- src/xterm.c 2014-07-22 10:34:05 +0000 +++ src/xterm.c 2014-07-22 13:55:04 +0000 @@ -9269,13 +9269,13 @@ unload_color (f, f->output_data.x->scroll_bar_background_pixel); if (f->output_data.x->scroll_bar_foreground_pixel != -1) unload_color (f, f->output_data.x->scroll_bar_foreground_pixel); -#ifdef USE_TOOLKIT_SCROLL_BARS +#if defined (USE_LUCID) && defined (USE_TOOLKIT_SCROLL_BARS) /* Scrollbar shadow colors. */ if (f->output_data.x->scroll_bar_top_shadow_pixel != -1) unload_color (f, f->output_data.x->scroll_bar_top_shadow_pixel); if (f->output_data.x->scroll_bar_bottom_shadow_pixel != -1) unload_color (f, f->output_data.x->scroll_bar_bottom_shadow_pixel); -#endif /* USE_TOOLKIT_SCROLL_BARS */ +#endif /* USE_LUCID && USE_TOOLKIT_SCROLL_BARS */ if (f->output_data.x->white_relief.pixel != -1) unload_color (f, f->output_data.x->white_relief.pixel); if (f->output_data.x->black_relief.pixel != -1) === modified file 'src/xterm.h' --- src/xterm.h 2014-07-22 10:34:05 +0000 +++ src/xterm.h 2014-07-22 13:55:04 +0000 @@ -541,10 +541,12 @@ bars). */ unsigned long scroll_bar_background_pixel; - /* Top and bottom shadow colors for 3d toolkit scrollbars. -1 means - let the scroll compute them itself. */ +#if defined (USE_LUCID) && defined (USE_TOOLKIT_SCROLL_BARS) + /* Top and bottom shadow colors for 3D Lucid scrollbars. + -1 means let the scroll compute them itself. */ unsigned long scroll_bar_top_shadow_pixel; unsigned long scroll_bar_bottom_shadow_pixel; +#endif /* Descriptor for the cursor in use for this window. */ Cursor text_cursor; ------------------------------------------------------------ revno: 117564 committer: Dmitry Antipov branch nick: trunk timestamp: Tue 2014-07-22 14:34:05 +0400 message: * xterm.h (struct x_output) [USE_X_TOOLKIT || USE_GTK]: Define menubar_height as such. Tweak comment. (FRAME_MENUBAR_HEIGHT) [!USE_X_TOOLKIT && !USE_GTK]: No-op. * xterm.c (handle_one_xevent): * gtkutil.c (xg_event_is_for_menubar): * xfns.c (x_window) [USE_X_TOOLKIT]: * xmenu.c (set_frame_menubar, free_frame_menubar): Prefer to use FRAME_MENUBAR_HEIGHT. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-07-21 16:58:12 +0000 +++ src/ChangeLog 2014-07-22 10:34:05 +0000 @@ -1,3 +1,14 @@ +2014-07-22 Dmitry Antipov + + * xterm.h (struct x_output) [USE_X_TOOLKIT || USE_GTK]: Define + menubar_height as such. Tweak comment. + (FRAME_MENUBAR_HEIGHT) [!USE_X_TOOLKIT && !USE_GTK]: No-op. + * xterm.c (handle_one_xevent): + * gtkutil.c (xg_event_is_for_menubar): + * xfns.c (x_window) [USE_X_TOOLKIT]: + * xmenu.c (set_frame_menubar, free_frame_menubar): Prefer + to use FRAME_MENUBAR_HEIGHT. + 2014-07-21 Dmitry Antipov * frame.c (Fframe_parameters): Always report frame height without === modified file 'src/gtkutil.c' --- src/gtkutil.c 2014-07-17 10:18:19 +0000 +++ src/gtkutil.c 2014-07-22 10:34:05 +0000 @@ -3374,7 +3374,7 @@ if (! (event->xbutton.x >= 0 && event->xbutton.x < FRAME_PIXEL_WIDTH (f) && event->xbutton.y >= 0 - && event->xbutton.y < f->output_data.x->menubar_height + && event->xbutton.y < FRAME_MENUBAR_HEIGHT (f) && event->xbutton.same_screen)) return 0; === modified file 'src/xfns.c' --- src/xfns.c 2014-07-20 16:14:58 +0000 +++ src/xfns.c 2014-07-22 10:34:05 +0000 @@ -2274,7 +2274,7 @@ } #endif - f->output_data.x->menubar_height = menubar_size; + FRAME_MENUBAR_HEIGHT (f) = menubar_size; #ifndef USE_LUCID /* Motif seems to need this amount added to the sizes @@ -2507,10 +2507,6 @@ class_hints.res_class = SSDATA (Vx_resource_class); XSetClassHint (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), &class_hints); - /* The menubar is part of the ordinary display; - it does not count in addition to the height of the window. */ - f->output_data.x->menubar_height = 0; - /* This indicates that we use the "Passive Input" input model. Unless we do this, we don't get the Focus{In,Out} events that we need to draw the cursor correctly. Accursed bureaucrats. === modified file 'src/xmenu.c' --- src/xmenu.c 2014-07-15 09:59:05 +0000 +++ src/xmenu.c 2014-07-22 10:34:05 +0000 @@ -1023,7 +1023,7 @@ #endif /* USE_LUCID */ #endif /* 1 */ - f->output_data.x->menubar_height = menubar_size; + FRAME_MENUBAR_HEIGHT (f) = menubar_size; } #endif /* not USE_GTK */ @@ -1066,7 +1066,7 @@ menubar_widget = f->output_data.x->menubar_widget; - f->output_data.x->menubar_height = 0; + FRAME_MENUBAR_HEIGHT (f) = 0; if (menubar_widget) { === modified file 'src/xterm.c' --- src/xterm.c 2014-07-20 16:14:58 +0000 +++ src/xterm.c 2014-07-22 10:34:05 +0000 @@ -6834,7 +6834,7 @@ && event->xbutton.x >= 0 && event->xbutton.x < FRAME_PIXEL_WIDTH (f) && event->xbutton.y >= 0 - && event->xbutton.y < f->output_data.x->menubar_height + && event->xbutton.y < FRAME_MENUBAR_HEIGHT (f) && event->xbutton.same_screen) { if (!f->output_data.x->saved_menu_event) === modified file 'src/xterm.h' --- src/xterm.h 2014-07-18 11:04:37 +0000 +++ src/xterm.h 2014-07-22 10:34:05 +0000 @@ -428,11 +428,11 @@ struct x_output { - /* Height of menu bar widget, in pixels. - Zero if not using the X toolkit. - When using the toolkit, this value is not meaningful - if the menubar is turned off. */ +#if defined (USE_X_TOOLKIT) || defined (USE_GTK) + /* Height of menu bar widget, in pixels. This value + is not meaningful if the menubar is turned off. */ int menubar_height; +#endif /* Height of tool bar widget, in pixels. top_height is used if tool bar at top, bottom_height if tool bar is at the bottom. @@ -714,10 +714,14 @@ #endif /* !USE_GTK */ #endif +#if defined (USE_X_TOOLKIT) || defined (USE_GTK) +#define FRAME_MENUBAR_HEIGHT(f) ((f)->output_data.x->menubar_height) +#else +#define FRAME_MENUBAR_HEIGHT(f) ((void) f, 0) +#endif /* USE_X_TOOLKIT || USE_GTK */ #define FRAME_FONT(f) ((f)->output_data.x->font) #define FRAME_FONTSET(f) ((f)->output_data.x->fontset) -#define FRAME_MENUBAR_HEIGHT(f) ((f)->output_data.x->menubar_height) #define FRAME_TOOLBAR_TOP_HEIGHT(f) ((f)->output_data.x->toolbar_top_height) #define FRAME_TOOLBAR_BOTTOM_HEIGHT(f) \ ((f)->output_data.x->toolbar_bottom_height) ------------------------------------------------------------ revno: 117563 committer: Katsumi Yamaoka branch nick: trunk timestamp: Tue 2014-07-22 06:37:31 +0000 message: gnus-utils.el (gnus-recursive-directory-files): Unify hard or symbolic links (bug#18063) diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2014-07-18 08:23:49 +0000 +++ lisp/gnus/ChangeLog 2014-07-22 06:37:31 +0000 @@ -1,3 +1,8 @@ +2014-07-22 Katsumi Yamaoka + + * gnus-utils.el (gnus-recursive-directory-files): + Unify hard or symbolic links (bug#18063). + 2013-07-17 Albert Krewinkel * gnus-msg.el (gnus-configure-posting-style): === modified file 'lisp/gnus/gnus-util.el' --- lisp/gnus/gnus-util.el 2014-03-23 23:13:36 +0000 +++ lisp/gnus/gnus-util.el 2014-07-22 06:37:31 +0000 @@ -1910,17 +1910,25 @@ image))) image))) +(eval-when-compile (require 'gmm-utils)) (defun gnus-recursive-directory-files (dir) - "Return all regular files below DIR." - (let (files) - (dolist (file (directory-files dir t)) - (when (and (not (member (file-name-nondirectory file) '("." ".."))) - (file-readable-p file)) - (cond - ((file-regular-p file) - (push file files)) - ((file-directory-p file) - (setq files (append (gnus-recursive-directory-files file) files)))))) + "Return all regular files below DIR. +The first found will be returned if a file has hard or symbolic links." + (let (files attr attrs) + (gmm-labels + ((fn (directory) + (dolist (file (directory-files directory t)) + (setq attr (file-attributes (file-truename file))) + (when (and (not (member attr attrs)) + (not (member (file-name-nondirectory file) + '("." ".."))) + (file-readable-p file)) + (push attr attrs) + (cond ((file-regular-p file) + (push file files)) + ((file-directory-p file) + (fn file))))))) + (fn dir)) files)) (defun gnus-list-memq-of-list (elements list)