Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 103795. ------------------------------------------------------------ revno: 103795 committer: Paul Eggert branch nick: trunk timestamp: Thu 2011-03-31 23:07:33 -0700 message: lib/stdio.in.h, m4/gnulib-common.m4: Regenerate from latest gnulib. diff: === modified file 'lib/stdio.in.h' --- lib/stdio.in.h 2011-03-21 05:04:41 +0000 +++ lib/stdio.in.h 2011-04-01 06:07:33 +0000 @@ -67,7 +67,24 @@ #else # define _GL_ATTRIBUTE_FORMAT(spec) /* empty */ #endif -#define _GL_ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \ + +/* _GL_ATTRIBUTE_FORMAT_PRINTF + indicates to GCC that the function takes a format string and arguments, + where the format string directives are the ones standardized by ISO C99 + and POSIX. */ +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) +# define _GL_ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \ + _GL_ATTRIBUTE_FORMAT ((__gnu_printf__, formatstring_parameter, first_argument)) +#else +# define _GL_ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \ + _GL_ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument)) +#endif + +/* _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM is like _GL_ATTRIBUTE_FORMAT_PRINTF, + except that it indicates to GCC that the supported format string directives + are the ones of the system printf(), rather than the ones standardized by + ISO C99 and POSIX. */ +#define _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM(formatstring_parameter, first_argument) \ _GL_ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument)) /* Solaris 10 declares renameat in , not in . */ @@ -191,9 +208,15 @@ # define fprintf rpl_fprintf # endif # define GNULIB_overrides_fprintf 1 +# if @GNULIB_FPRINTF_POSIX@ || @GNULIB_VFPRINTF_POSIX@ _GL_FUNCDECL_RPL (fprintf, int, (FILE *fp, const char *format, ...) _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3) _GL_ARG_NONNULL ((1, 2))); +# else +_GL_FUNCDECL_RPL (fprintf, int, (FILE *fp, const char *format, ...) + _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (2, 3) + _GL_ARG_NONNULL ((1, 2))); +# endif _GL_CXXALIAS_RPL (fprintf, int, (FILE *fp, const char *format, ...)); # else _GL_CXXALIAS_SYS (fprintf, int, (FILE *fp, const char *format, ...)); @@ -694,12 +717,21 @@ /* Don't break __attribute__((format(printf,M,N))). */ # define printf __printf__ # endif +# if @GNULIB_PRINTF_POSIX@ || @GNULIB_VFPRINTF_POSIX@ _GL_FUNCDECL_RPL_1 (__printf__, int, (const char *format, ...) __asm__ (@ASM_SYMBOL_PREFIX@ _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_printf)) _GL_ATTRIBUTE_FORMAT_PRINTF (1, 2) _GL_ARG_NONNULL ((1))); +# else +_GL_FUNCDECL_RPL_1 (__printf__, int, + (const char *format, ...) + __asm__ (@ASM_SYMBOL_PREFIX@ + _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_printf)) + _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (1, 2) + _GL_ARG_NONNULL ((1))); +# endif _GL_CXXALIAS_RPL_1 (printf, __printf__, int, (const char *format, ...)); # else # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -1004,9 +1036,15 @@ # define vfprintf rpl_vfprintf # endif # define GNULIB_overrides_vfprintf 1 +# if @GNULIB_VFPRINTF_POSIX@ _GL_FUNCDECL_RPL (vfprintf, int, (FILE *fp, const char *format, va_list args) _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0) _GL_ARG_NONNULL ((1, 2))); +# else +_GL_FUNCDECL_RPL (vfprintf, int, (FILE *fp, const char *format, va_list args) + _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (2, 0) + _GL_ARG_NONNULL ((1, 2))); +# endif _GL_CXXALIAS_RPL (vfprintf, int, (FILE *fp, const char *format, va_list args)); # else /* Need to cast, because on Solaris, the third parameter is @@ -1034,9 +1072,15 @@ # define vprintf rpl_vprintf # endif # define GNULIB_overrides_vprintf 1 +# if @GNULIB_VPRINTF_POSIX@ || @GNULIB_VFPRINTF_POSIX@ _GL_FUNCDECL_RPL (vprintf, int, (const char *format, va_list args) _GL_ATTRIBUTE_FORMAT_PRINTF (1, 0) _GL_ARG_NONNULL ((1))); +# else +_GL_FUNCDECL_RPL (vprintf, int, (const char *format, va_list args) + _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (1, 0) + _GL_ARG_NONNULL ((1))); +# endif _GL_CXXALIAS_RPL (vprintf, int, (const char *format, va_list args)); # else /* Need to cast, because on Solaris, the second parameter is === modified file 'm4/gnulib-common.m4' --- m4/gnulib-common.m4 2011-01-24 04:53:39 +0000 +++ m4/gnulib-common.m4 2011-04-01 06:07:33 +0000 @@ -1,4 +1,4 @@ -# gnulib-common.m4 serial 23 +# gnulib-common.m4 serial 24 dnl Copyright (C) 2007-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -109,7 +109,8 @@ AC_DEFUN([gl_ASSERT_NO_GNULIB_POSIXCHECK], [ dnl Override gl_WARN_ON_USE_PREPARE. - AC_DEFUN([gl_WARN_ON_USE_PREPARE], []) + dnl But hide this definition from 'aclocal'. + AC_DEFUN([gl_W][ARN_ON_USE_PREPARE], []) ]) # gl_ASSERT_NO_GNULIB_TESTS ------------------------------------------------------------ revno: 103794 committer: Juanma Barranquero branch nick: trunk timestamp: Thu 2011-03-31 21:42:38 +0200 message: src/xdisp.c (redisplay_internal): Fix prototype. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-03-31 19:12:30 +0000 +++ src/ChangeLog 2011-03-31 19:42:38 +0000 @@ -1,3 +1,7 @@ +2011-03-31 Juanma Barranquero + + * xdisp.c (redisplay_internal): Fix prototype. + 2011-03-31 Eli Zaretskii * xdisp.c (SCROLL_LIMIT): New macro. @@ -19,11 +23,6 @@ (syms_of_xdisp) : Document the threshold of 100 lines for never-recentering scrolling. -2011-03-26 Eli Zaretskii - - * xdisp.c (redisplay_window): Don't check buffer's clip_changed - flag as a prerequisite for invoking try_scrolling. (Bug#6671) - 2011-03-31 Juanma Barranquero * dispextern.h (move_it_by_lines): @@ -210,6 +209,11 @@ * s/usg5-4-common.h (SIGTYPE): Remove definition. * s/template.h (SIGTYPE): Remove commented out definition. +2011-03-26 Eli Zaretskii + + * xdisp.c (redisplay_window): Don't check buffer's clip_changed + flag as a prerequisite for invoking try_scrolling. (Bug#6671) + 2011-03-26 Juanma Barranquero * w32.c (read_unc_volume): Use parameter `henum', instead of === modified file 'src/xdisp.c' --- src/xdisp.c 2011-03-31 19:12:30 +0000 +++ src/xdisp.c 2011-03-31 19:42:38 +0000 @@ -807,7 +807,7 @@ static void pop_it (struct it *); static void sync_frame_with_window_matrix_rows (struct window *); static void select_frame_for_redisplay (Lisp_Object); -static void redisplay_internal (); +static void redisplay_internal (void); static int echo_area_display (int); static void redisplay_windows (Lisp_Object); static void redisplay_window (Lisp_Object, int); @@ -11415,7 +11415,7 @@ is not necessary; currently that causes some problems. */ static void -redisplay_internal () +redisplay_internal (void) { struct window *w = XWINDOW (selected_window); struct window *sw; ------------------------------------------------------------ revno: 103793 committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2011-03-31 21:28:26 +0200 message: etc/NEWS: Reflect new behavior due to revision 103792. diff: === modified file 'etc/NEWS' --- etc/NEWS 2011-03-30 22:25:57 +0000 +++ etc/NEWS 2011-03-31 19:28:26 +0000 @@ -204,6 +204,20 @@ ** New property `scroll-command' should be set on a command's symbol to define it as a scroll command affected by `scroll-preserve-screen-position'. ++++ +** If you customize `scroll-conservatively' to a value greater than 100, +Emacs will never recenter point in the window when it scrolls due to +cursor motion commands or commands that move point (e.f., `M-g M-g'). +Previously, you needed to use `most-positive-fixnum' as the value of +`scroll-conservatively' to achieve the same effect. + +--- +** ``Aggressive'' scrolling now honors the scroll margins. +If you customize `scroll-up-aggressively' or +`scroll-down-aggressively' and move point off the window, Emacs now +scrolls the window so as to avoid positioning point inside the scroll +margin. + ** Trash changes *** `delete-by-moving-to-trash' now only affects commands that specify ------------------------------------------------------------ revno: 103792 [merge] committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2011-03-31 21:12:30 +0200 message: Fix bug #6671 with recentering and other scrolling problems. src/xdisp.c (SCROLL_LIMIT): New macro. (try_scrolling): Use it when setting scroll_limit. Limit scrolling to 100 screen lines. (redisplay_window): Even when falling back on "recentering", position point in the window according to scroll-conservatively, scroll-margin, and scroll-*-aggressively variables. (try_scrolling): When point is above the window, allow searching as far as scroll_max, or one screenful, to compute vertical distance from PT to the scroll margin position. This prevents try_scrolling from unnecessarily failing when scroll-conservatively is set to a value slightly larger than the window height. Clean up the case of PT below the margin at bottom of window: scroll_max can no longer be INT_MAX. When aggressive scrolling is in use, don't let point enter the opposite scroll margin as result of the scroll. (syms_of_xdisp) : Document the threshold of 100 lines for never-recentering scrolling. doc/emacs/display.texi (Auto Scrolling): Document the limit of 100 lines for never-recentering scrolling with `scroll-conservatively'. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-03-12 19:19:47 +0000 +++ doc/emacs/ChangeLog 2011-03-30 20:59:42 +0000 @@ -1,3 +1,9 @@ +2011-03-30 Eli Zaretskii + + * display.texi (Auto Scrolling): Document the limit of 100 lines + for never-recentering scrolling with `scroll-conservatively'. + (Bug#6671) + 2011-03-12 Eli Zaretskii * msdog.texi (Windows HOME): Fix the wording to clarify how Emacs sets === modified file 'doc/emacs/display.texi' --- doc/emacs/display.texi 2011-03-08 04:31:57 +0000 +++ doc/emacs/display.texi 2011-03-30 20:59:42 +0000 @@ -183,7 +183,20 @@ if you set @code{scroll-conservatively} to a small number @var{n}, then if you move point just a little off the screen (less than @var{n} lines), Emacs scrolls the text just far enough to bring point back on -screen. By default, @code{scroll-conservatively} is@tie{}0. +screen. By default, @code{scroll-conservatively} is@tie{}0. If you +set @code{scroll-conservatively} to a large number (larger than 100), +Emacs will never center point as result of scrolling, even if point +moves far away from the text previously displayed in the window. With +such a large value, Emacs will always scroll text just enough for +bringing point into view, so point will end up at the top or bottom of +the window, depending on the scroll direction. + +@vindex scroll-step + The variable @code{scroll-step} determines how many lines to scroll +the window when point moves off the screen. If moving by that number +of lines fails to bring point back into view, point is centered +instead. The default value is zero, which causes point to always be +centered after scrolling. @cindex aggressive scrolling @vindex scroll-up-aggressively @@ -204,6 +217,9 @@ bottom of the window; thus, as with @code{scroll-up-aggressively}, a larger value is more aggressive. + These two variables are ignored if either @code{scroll-step} or +@code{scroll-conservatively} are set to a non-zero value. + @vindex scroll-margin The variable @code{scroll-margin} restricts how close point can come to the top or bottom of a window. Its value is a number of screen === modified file 'src/ChangeLog' --- src/ChangeLog 2011-03-31 01:37:51 +0000 +++ src/ChangeLog 2011-03-31 19:12:30 +0000 @@ -1,3 +1,29 @@ +2011-03-31 Eli Zaretskii + + * xdisp.c (SCROLL_LIMIT): New macro. + (try_scrolling): Use it when setting scroll_limit. Limit + scrolling to 100 screen lines. + (redisplay_window): Even when falling back on "recentering", + position point in the window according to scroll-conservatively, + scroll-margin, and scroll-*-aggressively variables. (Bug#6671) + + (try_scrolling): When point is above the window, allow searching + as far as scroll_max, or one screenful, to compute vertical + distance from PT to the scroll margin position. This prevents + try_scrolling from unnecessarily failing when + scroll-conservatively is set to a value slightly larger than the + window height. Clean up the case of PT below the margin at bottom + of window: scroll_max can no longer be INT_MAX. When aggressive + scrolling is in use, don't let point enter the opposite scroll + margin as result of the scroll. + (syms_of_xdisp) : Document the + threshold of 100 lines for never-recentering scrolling. + +2011-03-26 Eli Zaretskii + + * xdisp.c (redisplay_window): Don't check buffer's clip_changed + flag as a prerequisite for invoking try_scrolling. (Bug#6671) + 2011-03-31 Juanma Barranquero * dispextern.h (move_it_by_lines): @@ -184,11 +210,6 @@ * s/usg5-4-common.h (SIGTYPE): Remove definition. * s/template.h (SIGTYPE): Remove commented out definition. -2011-03-26 Eli Zaretskii - - * xdisp.c (redisplay_window): Don't check buffer's clip_changed - flag as a prerequisite for invoking try_scrolling. (Bug#6671) - 2011-03-26 Juanma Barranquero * w32.c (read_unc_volume): Use parameter `henum', instead of === modified file 'src/xdisp.c' --- src/xdisp.c 2011-03-31 01:37:51 +0000 +++ src/xdisp.c 2011-03-31 19:12:30 +0000 @@ -12992,6 +12992,12 @@ SCROLLING_NEED_LARGER_MATRICES }; +/* If scroll-conservatively is more than this, never recenter. + + If you change this, don't forget to update the doc string of + `scroll-conservatively' and the Emacs manual. */ +#define SCROLL_LIMIT 100 + static int try_scrolling (Lisp_Object window, int just_this_one_p, EMACS_INT arg_scroll_conservatively, EMACS_INT scroll_step, @@ -13005,7 +13011,8 @@ int dy = 0, amount_to_scroll = 0, scroll_down_p = 0; int extra_scroll_margin_lines = last_line_misfit ? 1 : 0; Lisp_Object aggressive; - int scroll_limit = INT_MAX / FRAME_LINE_HEIGHT (f); + /* We will never try scrolling more than this number of lines. */ + int scroll_limit = SCROLL_LIMIT; #if GLYPH_DEBUG debug_method_add (w, "try_scrolling"); @@ -13021,14 +13028,14 @@ else this_scroll_margin = 0; - /* Force arg_scroll_conservatively to have a reasonable value, to avoid - overflow while computing how much to scroll. Note that the user - can supply scroll-conservatively equal to `most-positive-fixnum', - which can be larger than INT_MAX. */ + /* Force arg_scroll_conservatively to have a reasonable value, to + avoid scrolling too far away with slow move_it_* functions. Note + that the user can supply scroll-conservatively equal to + `most-positive-fixnum', which can be larger than INT_MAX. */ if (arg_scroll_conservatively > scroll_limit) { - arg_scroll_conservatively = scroll_limit; - scroll_max = INT_MAX; + arg_scroll_conservatively = scroll_limit + 1; + scroll_max = scroll_limit * FRAME_LINE_HEIGHT (f); } else if (scroll_step || arg_scroll_conservatively || temp_scroll_step) /* Compute how much we should try to scroll maximally to bring @@ -13065,13 +13072,10 @@ /* Compute how many pixels below window bottom to stop searching for PT. This avoids costly search for PT that is far away if the user limited scrolling by a small number of lines, but - always finds PT if arg_scroll_conservatively is set to a large + always finds PT if scroll_conservatively is set to a large number, such as most-positive-fixnum. */ int slack = max (scroll_max, 10 * FRAME_LINE_HEIGHT (f)); - int y_to_move = - slack >= INT_MAX - it.last_visible_y - ? INT_MAX - : it.last_visible_y + slack; + int y_to_move = it.last_visible_y + slack; /* Compute the distance from the scroll margin to PT or to the scroll limit, whichever comes first. This should @@ -13110,6 +13114,10 @@ amount_to_scroll = float_amount; if (amount_to_scroll == 0 && float_amount > 0) amount_to_scroll = 1; + /* Don't let point enter the scroll margin near top of + the window. */ + if (amount_to_scroll > height - 2*this_scroll_margin + dy) + amount_to_scroll = height - 2*this_scroll_margin + dy; } } @@ -13117,12 +13125,12 @@ return SCROLLING_FAILED; start_display (&it, w, startp); - if (scroll_max < INT_MAX) + if (arg_scroll_conservatively <= scroll_limit) move_it_vertically (&it, amount_to_scroll); else { /* Extra precision for users who set scroll-conservatively - to most-positive-fixnum: make sure the amount we scroll + to a large number: make sure the amount we scroll the window start is never less than amount_to_scroll, which was computed as distance from window bottom to point. This matters when lines at window top and lines @@ -13160,16 +13168,19 @@ { /* Point is in the scroll margin at the top of the window or above what is displayed in the window. */ - int y0; + int y0, y_to_move; /* Compute the vertical distance from PT to the scroll - margin position. Give up if distance is greater than - scroll_max. */ + margin position. Move as far as scroll_max allows, or + one screenful, or 10 screen lines, whichever is largest. + Give up if distance is greater than scroll_max. */ SET_TEXT_POS (pos, PT, PT_BYTE); start_display (&it, w, pos); y0 = it.current_y; + y_to_move = max (it.last_visible_y, + max (scroll_max, 10 * FRAME_LINE_HEIGHT (f))); move_it_to (&it, CHARPOS (scroll_margin_pos), 0, - it.last_visible_y, -1, + y_to_move, -1, MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y); dy = it.current_y - y0; if (dy > scroll_max) @@ -13179,8 +13190,8 @@ start_display (&it, w, startp); if (arg_scroll_conservatively) - amount_to_scroll - = max (dy, FRAME_LINE_HEIGHT (f) * max (scroll_step, temp_scroll_step)); + amount_to_scroll = max (dy, FRAME_LINE_HEIGHT (f) * + max (scroll_step, temp_scroll_step)); else if (scroll_step || temp_scroll_step) amount_to_scroll = scroll_max; else @@ -13193,6 +13204,12 @@ amount_to_scroll = float_amount; if (amount_to_scroll == 0 && float_amount > 0) amount_to_scroll = 1; + amount_to_scroll -= + this_scroll_margin - dy - FRAME_LINE_HEIGHT (f); + /* Don't let point enter the scroll margin near + bottom of the window. */ + if (amount_to_scroll > height - 2*this_scroll_margin + dy) + amount_to_scroll = height - 2*this_scroll_margin + dy; } } @@ -14190,11 +14207,10 @@ } } - /* Finally, just choose place to start which centers point */ + /* Finally, just choose a place to start which positions point + according to user preferences. */ recenter: - if (centering_position < 0) - centering_position = window_box_height (w) / 2; #if GLYPH_DEBUG debug_method_add (w, "recenter"); @@ -14206,10 +14222,77 @@ if (!buffer_unchanged_p) w->base_line_number = Qnil; - /* Move backward half the height of the window. */ + /* Determine the window start relative to point. */ init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID); it.current_y = it.last_visible_y; + if (centering_position < 0) + { + int margin = + scroll_margin > 0 + ? min (scroll_margin, WINDOW_TOTAL_LINES (w) / 4) + : 0; + EMACS_INT margin_pos = CHARPOS (startp); + int scrolling_up; + Lisp_Object aggressive; + + /* If there is a scroll margin at the top of the window, find + its character position. */ + if (margin) + { + struct it it1; + + start_display (&it1, w, startp); + move_it_vertically (&it1, margin); + margin_pos = IT_CHARPOS (it1); + } + scrolling_up = PT > margin_pos; + aggressive = + scrolling_up + ? BVAR (current_buffer, scroll_up_aggressively) + : BVAR (current_buffer, scroll_down_aggressively); + + if (!MINI_WINDOW_P (w) + && (scroll_conservatively > SCROLL_LIMIT || NUMBERP (aggressive))) + { + int pt_offset = 0; + + /* Setting scroll-conservatively overrides + scroll-*-aggressively. */ + if (!scroll_conservatively && NUMBERP (aggressive)) + { + double float_amount = XFLOATINT (aggressive); + + pt_offset = float_amount * WINDOW_BOX_TEXT_HEIGHT (w); + if (pt_offset == 0 && float_amount > 0) + pt_offset = 1; + if (pt_offset) + margin -= 1; + } + /* Compute how much to move the window start backward from + point so that point will be displayed where the user + wants it. */ + if (scrolling_up) + { + centering_position = it.last_visible_y; + if (pt_offset) + centering_position -= pt_offset; + centering_position -= + FRAME_LINE_HEIGHT (f) * (1 + margin + (last_line_misfit != 0)); + /* Don't let point enter the scroll margin near top of + the window. */ + if (centering_position < margin * FRAME_LINE_HEIGHT (f)) + centering_position = margin * FRAME_LINE_HEIGHT (f); + } + else + centering_position = margin * FRAME_LINE_HEIGHT (f) + pt_offset; + } + else + /* Set the window start half the height of the window backward + from point. */ + centering_position = window_box_height (w) / 2; + } move_it_vertically_backward (&it, centering_position); + xassert (IT_CHARPOS (it) >= BEGV); /* The function move_it_vertically_backward may move over more @@ -14226,8 +14309,9 @@ it.current_x = it.hpos = 0; - /* Set startp here explicitly in case that helps avoid an infinite loop - in case the window-scroll-functions functions get errors. */ + /* Set the window start position here explicitly, to avoid an + infinite loop in case the functions in window-scroll-functions + get errors. */ set_marker_both (w->start, Qnil, IT_CHARPOS (it), IT_BYTEPOS (it)); /* Run scroll hooks. */ @@ -26504,6 +26588,10 @@ onto the screen again. If that cannot be done, then redisplay recenters point as usual. +If the value is greater than 100, redisplay will never recenter point, +but will always scroll just enough text to bring point into view, even +if you move far away. + A value of zero means always recenter point if it moves off screen. */); scroll_conservatively = 0; ------------------------------------------------------------ revno: 103791 committer: Stefan Monnier branch nick: trunk timestamp: Thu 2011-03-31 11:17:06 -0400 message: * lisp/loadup.el: Load minibuffer after loaddefs, to use define-minor-mode. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-31 12:19:17 +0000 +++ lisp/ChangeLog 2011-03-31 15:17:06 +0000 @@ -1,3 +1,7 @@ +2011-03-31 Stefan Monnier + + * loadup.el: Load minibuffer after loaddefs, to use define-minor-mode. + 2011-03-31 Tassilo Horn * net/rcirc.el (rcirc-handler-001): Only authenticate, if there's === modified file 'lisp/loadup.el' --- lisp/loadup.el 2011-01-26 08:36:39 +0000 +++ lisp/loadup.el 2011-03-31 15:17:06 +0000 @@ -106,7 +106,6 @@ (load "cus-face") (load "faces") ; after here, `defface' may be used. -(load "minibuffer") (load "button") (load "startup") @@ -117,6 +116,7 @@ ;; In case loaddefs hasn't been generated yet. (file-error (load "ldefs-boot.el"))) +(load "minibuffer") (load "abbrev") ;lisp-mode.el and simple.el use define-abbrev-table. (load "simple") ------------------------------------------------------------ revno: 103790 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2011-03-31 13:31:56 +0000 message: gnus-sum.el (gnus-update-marks): Revert intersection change, which made marks not propagate, again. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-03-30 14:59:42 +0000 +++ lisp/gnus/ChangeLog 2011-03-31 13:31:56 +0000 @@ -1,3 +1,8 @@ +2011-03-30 Lars Magne Ingebrigtsen + + * gnus-sum.el (gnus-update-marks): Revert intersection change, which + made marks not propagate, again. + 2011-03-30 Chong Yidong * proto-stream.el (open-protocol-stream): Bring back `network' type. === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2011-03-30 14:59:42 +0000 +++ lisp/gnus/gnus-sum.el 2011-03-31 13:31:56 +0000 @@ -6072,14 +6072,10 @@ ;; didn't actually get any headers for. (existing (gnus-compress-sequence gnus-newsgroup-articles)) (del - (gnus-sorted-range-intersection - existing - (gnus-remove-from-range (gnus-copy-sequence old) list))) + (gnus-remove-from-range (gnus-copy-sequence old) list)) (add - (gnus-sorted-range-intersection - existing - (gnus-remove-from-range - (gnus-copy-sequence list) old)))) + (gnus-remove-from-range + (gnus-copy-sequence list) old))) (when add (push (list add 'add (list (cdr type))) delta-marks)) (when del ------------------------------------------------------------ revno: 103789 committer: Tassilo Horn branch nick: trunk timestamp: Thu 2011-03-31 14:19:17 +0200 message: * net/rcirc.el (rcirc-handler-001): Only authenticate, if there's an entry for that server in rcirc-authinfo. (Bug#8385) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-31 07:20:38 +0000 +++ lisp/ChangeLog 2011-03-31 12:19:17 +0000 @@ -1,3 +1,8 @@ +2011-03-31 Tassilo Horn + + * net/rcirc.el (rcirc-handler-001): Only authenticate, if there's + an entry for that server in rcirc-authinfo. (Bug#8385) + 2011-03-31 Glenn Morris * progmodes/f90.el (f90-find-tag-default): Handle multiple `%'. === modified file 'lisp/net/rcirc.el' --- lisp/net/rcirc.el 2011-03-22 11:51:48 +0000 +++ lisp/net/rcirc.el 2011-03-31 12:19:17 +0000 @@ -2454,7 +2454,15 @@ (setq rcirc-nick (car args)) (rcirc-update-prompt) (if rcirc-auto-authenticate-flag - (if rcirc-authenticate-before-join + (if (and rcirc-authenticate-before-join + ;; We have to ensure that there's an authentication + ;; entry for that server. Else, + ;; rcirc-authenticated-hook won't be triggered, and + ;; autojoin won't happen at all. + (let (auth-required) + (dolist (s rcirc-authinfo auth-required) + (when (string-match (car s) rcirc-server-name) + (setq auth-required t))))) (progn (add-hook 'rcirc-authenticated-hook 'rcirc-join-channels-post-auth t t) (rcirc-authenticate)) ------------------------------------------------------------ revno: 103788 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-03-31 00:20:38 -0700 message: * lisp/progmodes/f90.el (f90-find-tag-default): Handle multiple `%'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-31 02:11:34 +0000 +++ lisp/ChangeLog 2011-03-31 07:20:38 +0000 @@ -1,5 +1,7 @@ 2011-03-31 Glenn Morris + * progmodes/f90.el (f90-find-tag-default): Handle multiple `%'. + * generic-x.el (etc-fstab-generic-mode): Add ext4, sysfs keywords. 2011-03-30 Christoph Scholtes === modified file 'lisp/progmodes/f90.el' --- lisp/progmodes/f90.el 2011-02-05 22:30:14 +0000 +++ lisp/progmodes/f90.el 2011-03-31 07:20:38 +0000 @@ -2203,7 +2203,7 @@ (let ((tag (find-tag-default))) (or (and tag ;; See bug#7919. TODO I imagine there are other cases...? - (string-match "%\\(.+\\)" tag) + (string-match "%\\([^%]+\\)\\'" tag) (match-string-no-properties 1 tag)) tag))) ------------------------------------------------------------ revno: 103787 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-03-30 19:11:34 -0700 message: * lisp/generic-x.el (etc-fstab-generic-mode): Add ext4, sysfs keywords. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-30 22:44:07 +0000 +++ lisp/ChangeLog 2011-03-31 02:11:34 +0000 @@ -1,3 +1,7 @@ +2011-03-31 Glenn Morris + + * generic-x.el (etc-fstab-generic-mode): Add ext4, sysfs keywords. + 2011-03-30 Christoph Scholtes * progmodes/python.el (python-default-interpreter) === modified file 'lisp/generic-x.el' --- lisp/generic-x.el 2011-03-06 02:59:21 +0000 +++ lisp/generic-x.el 2011-03-31 02:11:34 +0000 @@ -1705,6 +1705,7 @@ "efs" "ext2" "ext3" + "ext4" "hfs" "hpfs" "iso9660" @@ -1722,6 +1723,7 @@ "cifs" "usbdevfs" "sysv" + "sysfs" "tmpfs" "udf" "ufs" ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.