From 78b8f32044a91adcf8d60d937beae2184247a78c Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Sun, 31 Mar 2013 08:31:27 +1300 Subject: [PATCH 1/3] Use present tense in ChangeLog entries. --- doc/misc/ChangeLog | 5 ++--- etc/ChangeLog | 2 +- lisp/ChangeLog | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 801cf5aee4c..2b58a61570e 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,6 +1,6 @@ 2013-03-27 Aidan Gauland - * eshell.texi: Updated manual to reflect changes. + * eshell.texi (Built-ins): Update manual to mention tramp module. 2013-03-18 Michael Albinus @@ -2415,8 +2415,7 @@ 2013-02-18 Aidan Gauland - * eshell.texi: Added documentation for Eshell insert - output redirection operator, >>>. + * eshell.texi (Input/Output): Document insert output redirection operator, >>>. 2011-02-18 Glenn Morris diff --git a/etc/ChangeLog b/etc/ChangeLog index 92f31e6c6e8..5b55e35397b 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -4,7 +4,7 @@ 2013-03-29 Aidan Gauland - * NEWS: Added entry for em-tramp change in 2013-03-26T22:08:58Z!aidalgol@no8wireless.co.nz + * NEWS (Eshell): New entry for em-tramp change in 2013-03-26T22:08:58Z!aidalgol@no8wireless.co.nz 2013-03-21 Eric Ludlam diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d1b827966de..ced7672ef99 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -80,7 +80,7 @@ 2013-03-27 Aidan Gauland - * eshell/em-unix.el: Moved su and sudo to... + * eshell/em-unix.el: Move su and sudo to... * eshell/em-tramp.el: ...Eshell tramp module 2013-03-26 Stefan Monnier @@ -1083,8 +1083,8 @@ 2013-02-18 Aidan Gauland - * eshell/em-cmpl.el: Corrected "context-related help" - keybinding in commentary. + * eshell/em-cmpl.el: Correct "context-related help" keybinding in + commentary. 2013-02-18 Michael Heerdegen From 9275998872e6932aee942f8805ac06220688c009 Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Sun, 31 Mar 2013 09:45:54 +0400 Subject: [PATCH 2/3] * frame.h (struct frame): Drop scroll_bottom_vpos member becaue all real users are dead long ago. (FRAME_SCROLL_BOTTOM_VPOS): Remove. * xdisp.c (redisplay_internal): Adjust user. --- src/ChangeLog | 7 +++++++ src/frame.h | 5 ----- src/xdisp.c | 2 -- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index b9e9cce5cb7..b2b4aa6895c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2013-03-31 Dmitry Antipov + + * frame.h (struct frame): Drop scroll_bottom_vpos + member becaue all real users are dead long ago. + (FRAME_SCROLL_BOTTOM_VPOS): Remove. + * xdisp.c (redisplay_internal): Adjust user. + 2013-03-30 Darren Ho (tiny change) * nsmenu.m (showAtX:Y:for:): setLevel to diff --git a/src/frame.h b/src/frame.h index 32a6954024e..46e18dd8ddb 100644 --- a/src/frame.h +++ b/src/frame.h @@ -427,10 +427,6 @@ struct frame /* Width of bar cursor (if we are using that) for blink-off state. */ int blink_off_cursor_width; - /* Nonnegative if current redisplay should not do scroll computation - for lines beyond a certain vpos. This is the vpos. */ - int scroll_bottom_vpos; - /* Configured width of the scroll bar, in pixels and in characters. config_scroll_bar_cols tracks config_scroll_bar_width if the latter is positive; a zero value in config_scroll_bar_width means @@ -785,7 +781,6 @@ typedef struct frame *FRAME_PTR; #define FRAME_DELETE_COST(f) (f)->delete_line_cost #define FRAME_INSERTN_COST(f) (f)->insert_n_lines_cost #define FRAME_DELETEN_COST(f) (f)->delete_n_lines_cost -#define FRAME_SCROLL_BOTTOM_VPOS(f) (f)->scroll_bottom_vpos #define FRAME_FOCUS_FRAME(f) f->focus_frame /* This frame slot says whether scroll bars are currently enabled for frame F, diff --git a/src/xdisp.c b/src/xdisp.c index 32c8224cf04..a7be5fc275c 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -12948,8 +12948,6 @@ redisplay_internal (void) unbind_to (count1, Qnil); - FRAME_SCROLL_BOTTOM_VPOS (XFRAME (w->frame)) = -1; - consider_all_windows_p = (update_mode_lines || buffer_shared_and_changed () || cursor_type_changed); From 6ea3f01e74cbae9dc1366a07aea09d9665167981 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 31 Mar 2013 06:17:42 -0400 Subject: [PATCH 3/3] Auto-commit of generated files. --- autogen/configure | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/autogen/configure b/autogen/configure index 126248beced..23685c523ac 100755 --- a/autogen/configure +++ b/autogen/configure @@ -23965,8 +23965,9 @@ else #if \ (__GNUC__ || __IBMC__ || __IBMCPP__ \ || 0x5110 <= __SUNPRO_C || 1300 <= _MSC_VER) - int alignas (8) alignas_int = 1; - char test_alignas[_Alignof (alignas_int) == 8 ? 1 : -1]; + struct alignas_test { char c; char alignas (8) alignas_8; }; + char test_alignas[offsetof (struct alignas_test, alignas_8) == 8 + ? 1 : -1]; #endif int