From 9aabf64c78017a55dedab5481ed20776c57f284b Mon Sep 17 00:00:00 2001 From: Jan Djärv Date: Tue, 8 Feb 2011 08:19:20 +0100 Subject: * nsterm.m (setFrame, initFrame): Make sure pixel_height doesn't become zero. Fixes: debbugs:7348 --- src/ChangeLog | 5 +++++ src/nsterm.m | 2 ++ 2 files changed, 7 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 2b02030fd4f..2df187383a4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-02-08 Jan Djärv + + * nsterm.m (setFrame, initFrame): Make sure pixel_height doesn't become + zero (Bug#7348). + 2011-02-03 Glenn Morris * xfaces.c (Finternal_set_lisp_face_attribute): diff --git a/src/nsterm.m b/src/nsterm.m index addb6d01d71..30b73c2fd13 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -5721,6 +5721,7 @@ ns_term_shutdown (int sig) win = nwin; condemned = NO; pixel_height = NSHeight (r); + if (pixel_height == 0) pixel_height = 1; min_portion = 20 / pixel_height; frame = XFRAME (XWINDOW (win)->frame); @@ -5750,6 +5751,7 @@ ns_term_shutdown (int sig) NSTRACE (EmacsScroller_setFrame); /* BLOCK_INPUT; */ pixel_height = NSHeight (newRect); + if (pixel_height == 0) pixel_height = 1; min_portion = 20 / pixel_height; [super setFrame: newRect]; [self display]; -- cgit v1.2.1 From bae1fa42dc24348d6ba303b633a3cf19dec625fa Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Tue, 8 Feb 2011 19:11:15 -0500 Subject: Fix to select_window. http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00346.html * window.c (select_window): Check inhibit_point_swap argument when deciding whether to return immediately. --- src/ChangeLog | 5 +++++ src/window.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 2df187383a4..9fbf1841982 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-02-09 Martin Rudalics + + * window.c (select_window): Check inhibit_point_swap argument when + deciding whether to return immediately. + 2011-02-08 Jan Djärv * nsterm.m (setFrame, initFrame): Make sure pixel_height doesn't become diff --git a/src/window.c b/src/window.c index 12775ffa7d4..3e6062a7153 100644 --- a/src/window.c +++ b/src/window.c @@ -3607,7 +3607,7 @@ select_window (window, norecord, inhibit_point_swap) XSETFASTINT (w->use_time, window_select_count); } - if (EQ (window, selected_window)) + if (EQ (window, selected_window) && !inhibit_point_swap) return window; sf = SELECTED_FRAME (); -- cgit v1.2.1 From b762841f959188397404ed752f0f6ed9db5c93fb Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Sat, 12 Feb 2011 04:17:00 +0100 Subject: Fix trivial typos in comments and ChangeLogs. --- src/ChangeLog | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 9fbf1841982..f530a8d904e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -114,7 +114,7 @@ (x_set_title): Remove commet about EXPLICIT. Call ns_set_name_internal. (ns_set_name_as_filename): Encode name with ENCODE_UTF_8. Always use buffer name for title and buffer filename only for - RepresentedFilename. Handle bad UTF-8 in buffer name (Bug#7517). + RepresentedFilename. Handle bad UTF-8 in buffer name (Bug#7517). 2011-01-03 Eli Zaretskii @@ -264,7 +264,7 @@ * gtkutil.c (menubar_map_cb): New function (Bug#7425). (xg_update_frame_menubar): Connect signal map to menubar_map_cb. - Use 23 as menubar height if 0. (Bug#7425). + Use 23 as menubar height if 0. (Bug#7425). 2010-11-14 Jan Djärv @@ -488,7 +488,7 @@ is more portable. * keyboard.c (gobble_input): Move call of xd_read_queued_messages ... - (kbd_buffer_get_event): ... here. This is needed for cygwin, which + (kbd_buffer_get_event): ... here. This is needed for cygwin, which has not defined SIGIO. 2010-09-27 Michael Albinus @@ -685,7 +685,7 @@ * nsterm.m (ns_draw_fringe_bitmap): Likewise. * fringe.c (draw_fringe_bitmap_1): Don't clip bitmap here. - Take account of bitmap offset. + Take account of bitmap offset. (draw_window_fringes): Take account of window vscroll. (update_window_fringes): Likewise. Extend top-aligned top indicator or bottom-aligned bottom indicator to adjacent rows if it doesn't fit -- cgit v1.2.1 From cb191a14ce7507c5131c36625e34f462180f4c33 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 12 Feb 2011 04:47:28 -0500 Subject: Fix bug #7840 with setting terminal/keyboard encoding of emacsclient frames. terminal.c (create_terminal): Use default-keyboard-coding-system and default-terminal-coding-system to initialize coding systems of the new terminal. --- src/ChangeLog | 6 ++++++ src/terminal.c | 19 +++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index f530a8d904e..b90a9c02e8b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2011-02-12 Eli Zaretskii + + * terminal.c (create_terminal): Use default-keyboard-coding-system + and default-terminal-coding-system to initialize coding systems of + the new terminal. (Bug#7840) + 2011-02-09 Martin Rudalics * window.c (select_window): Check inhibit_point_swap argument when diff --git a/src/terminal.c b/src/terminal.c index 041dc28f977..a51a18c934d 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -226,6 +226,7 @@ struct terminal * create_terminal (void) { struct terminal *terminal = allocate_terminal (); + Lisp_Object terminal_coding, keyboard_coding; terminal->name = NULL; terminal->next_terminal = terminal_list; @@ -238,8 +239,22 @@ create_terminal (void) terminal->terminal_coding = (struct coding_system *) xmalloc (sizeof (struct coding_system)); - setup_coding_system (Qno_conversion, terminal->keyboard_coding); - setup_coding_system (Qundecided, terminal->terminal_coding); + /* If default coding systems for the terminal and the keyboard are + already defined, use them in preference to the defaults. This is + needed when Emacs runs in daemon mode. */ + keyboard_coding = SYMBOL_VALUE (intern ("default-keyboard-coding-system")); + if (NILP (keyboard_coding) + || EQ (keyboard_coding, Qunbound) + || NILP (Fcoding_system_p (keyboard_coding))) + keyboard_coding = Qno_conversion; + terminal_coding = SYMBOL_VALUE (intern ("default-terminal-coding-system")); + if (NILP (terminal_coding) + || EQ (terminal_coding, Qunbound) + || NILP (Fcoding_system_p (terminal_coding))) + terminal_coding = Qundecided; + + setup_coding_system (keyboard_coding, terminal->keyboard_coding); + setup_coding_system (terminal_coding, terminal->terminal_coding); terminal->param_alist = Qnil; return terminal; -- cgit v1.2.1