Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge from trunk.

Browse source
This commit is contained in:
Eli Zaretskii 2013-03-31 15:36:07 +03:00
commit 65d72c1bf8
7 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
autogen/configure vendored
View file

@ -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

5
doc/misc/ChangeLog
View file

@ -1,6 +1,6 @@
2013-03-27 Aidan Gauland <aidalgol@no8wireless.co.nz>
* eshell.texi: Updated manual to reflect changes.
* eshell.texi (Built-ins): Update manual to mention tramp module.
2013-03-18 Michael Albinus <michael.albinus@gmx.de>
@ -2415,8 +2415,7 @@
2013-02-18 Aidan Gauland <aidalgol@no8wireless.co.nz>
* eshell.texi: Added documentation for Eshell insert
output redirection operator, >>>.
* eshell.texi (Input/Output): Document insert output redirection operator, >>>.
2011-02-18 Glenn Morris <rgm@gnu.org>

2
etc/ChangeLog
View file

@ -4,7 +4,7 @@
2013-03-29 Aidan Gauland <aidalgol@no8wireless.co.nz>
* 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 <zappo@gnu.org>

6
lisp/ChangeLog
View file

@ -80,7 +80,7 @@
2013-03-27 Aidan Gauland <aidalgol@no8wireless.co.nz>
* 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 <monnier@iro.umontreal.ca>
@ -1083,8 +1083,8 @@
2013-02-18 Aidan Gauland <aidalgol@no8wireless.co.nz>
* 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 <michael_heerdegen@web.de>

7
src/ChangeLog
View file

@ -1,3 +1,10 @@
2013-03-31 Dmitry Antipov <dmantipov@yandex.ru>
* 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 <darren.hoo@gmail.com> (tiny change)
* nsmenu.m (showAtX:Y:for:): setLevel to

5
src/frame.h
View file

@ -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,

2
src/xdisp.c
View file

@ -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);