diff options
| author | Stephen Leake | 2019-04-11 14:00:02 -0700 |
|---|---|---|
| committer | Stephen Leake | 2019-04-11 14:00:02 -0700 |
| commit | 7ba7def5caf7ec9d9bebffff489f0a658229fbda (patch) | |
| tree | e0cfcb59937ca0528fb81769d7d48a904a91f5dc /src/xterm.c | |
| parent | 7768581172e11be52b1fcd8224f4594e126bbdb7 (diff) | |
| parent | de238b39e335c6814283faa171b35145f124edf2 (diff) | |
| download | emacs-7ba7def5caf7ec9d9bebffff489f0a658229fbda.tar.gz emacs-7ba7def5caf7ec9d9bebffff489f0a658229fbda.zip | |
Merge commit 'de238b39e335c6814283faa171b35145f124edf2'
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xterm.c b/src/xterm.c index 2f830afe61b..5aa3e3ff25c 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -6611,8 +6611,8 @@ x_scroll_bar_create (struct window *w, int top, int left, | |||
| 6611 | int width, int height, bool horizontal) | 6611 | int width, int height, bool horizontal) |
| 6612 | { | 6612 | { |
| 6613 | struct frame *f = XFRAME (w->frame); | 6613 | struct frame *f = XFRAME (w->frame); |
| 6614 | struct scroll_bar *bar | 6614 | struct scroll_bar *bar = ALLOCATE_PSEUDOVECTOR (struct scroll_bar, prev, |
| 6615 | = ALLOCATE_PSEUDOVECTOR (struct scroll_bar, x_window, PVEC_OTHER); | 6615 | PVEC_OTHER); |
| 6616 | Lisp_Object barobj; | 6616 | Lisp_Object barobj; |
| 6617 | 6617 | ||
| 6618 | block_input (); | 6618 | block_input (); |