diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 45 | ||||
| -rw-r--r-- | src/Makefile.in | 3 | ||||
| -rw-r--r-- | src/coding.c | 2 | ||||
| -rw-r--r-- | src/deps.mk | 6 | ||||
| -rw-r--r-- | src/nsmenu.m | 3 | ||||
| -rw-r--r-- | src/nsterm.h | 1 | ||||
| -rw-r--r-- | src/nsterm.m | 31 | ||||
| -rw-r--r-- | src/w32fns.c | 4 | ||||
| -rw-r--r-- | src/xfns.c | 6 |
9 files changed, 70 insertions, 31 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ec9c0ce42fd..1db9e8768e3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -4,6 +4,51 @@ (MAX_CHARBUF_EXTRA_SIZE): New macro. (ALLOC_CONVERSION_WORK_AREA): Use MAX_CHARBUF_EXTRA_SIZE. +2014-06-30 Jan Djärv <jan.h.d@swipnet.se> + + * nsterm.m (judge): EmacsScroller: Move dealloc code here. + (dealloc): Remove for EmacsScroller. + + * nsterm.h (EmacsScroller): Remove dealloc. + +2014-06-30 Eli Zaretskii <eliz@gnu.org> + + * coding.c (MIN_CHARBUF_SIZE): Enlarge to 32. (Bug#17881) + +2014-06-30 Jan Djärv <jan.h.d@swipnet.se> + + * nsmenu.m (update_frame_tool_bar): Set wait_for_tool_bar to NO + when setNeedsDisplay is called so we don't trigger redisplay for every + tool bar update. + + * nsterm.m (any_help_event_p): New variable. + (mouseMoved:): Set any_help_event_p to YES if help event is + generated. Remove else with empty help event that triggered redisplay + for every mouse move. + (windowDidResignKey:): If any_help_event_p, generate empty help + event. + +2014-06-29 Dmitry Antipov <dmantipov@yandex.ru> + + * xfns.c (Qsuppress_icon): Remove; no real users. + (syms_of_xfns): Don't DEFSYM it. Remove ancient comments. + * w32fns.c (Qsuppress_icon): Remove, for the same reason. + (syms_of_w32fns): Don't DEFSYM it. + +2014-06-29 Glenn Morris <rgm@gnu.org> + + * Makefile.in (ns-app): Mark as PHONY. + +2014-06-28 Glenn Morris <rgm@gnu.org> + + * Makefile.in (mostlyclean): There are no libXMenu11.a, + liblw.a in this directory. + +2014-06-28 Andreas Schwab <schwab@linux-m68k.org> + + * coding.c (encode_coding_utf_8): Correctly count produced_chars + also in unibyte case. (Bug#17865) + 2014-06-28 K. Handa <handa@gnu.org> * coding.c (MAX_CHARBUF_SIZE): Renamed from CHARBUF_SIZE. diff --git a/src/Makefile.in b/src/Makefile.in index 748f38e55bd..a13f7b8b8be 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -518,6 +518,7 @@ emacs.res: $(ntsource)/emacs.rc \ $(WINDRES) -O COFF --include-dir=$(srcdir)/../nt \ -o $@ $(ntsource)/emacs.rc +.PHONY: ns-app ns-app: emacs$(EXEEXT) $(MAKE) -C ../nextstep all @@ -525,7 +526,7 @@ ns-app: emacs$(EXEEXT) .PHONY: versionclean extraclean mostlyclean: - rm -f temacs$(EXEEXT) core *.core \#* *.o libXMenu11.a liblw.a + rm -f temacs$(EXEEXT) core *.core \#* *.o rm -f ../etc/DOC rm -f bootstrap-emacs$(EXEEXT) emacs-$(version)$(EXEEXT) rm -f buildobj.h diff --git a/src/coding.c b/src/coding.c index e68700c099d..d4c468cfbbf 100644 --- a/src/coding.c +++ b/src/coding.c @@ -1549,8 +1549,8 @@ encode_coding_utf_8 (struct coding_system *coding) *dst++ = CHAR_TO_BYTE8 (c); else CHAR_STRING_ADVANCE_NO_UNIFY (c, dst); - produced_chars++; } + produced_chars = dst - (coding->destination + coding->produced); } record_conversion_result (coding, CODING_RESULT_SUCCESS); coding->produced_char += produced_chars; diff --git a/src/deps.mk b/src/deps.mk index 1d67d750983..3fdbbe6605f 100644 --- a/src/deps.mk +++ b/src/deps.mk @@ -1,7 +1,7 @@ ### deps.mk --- src/Makefile fragment for GNU Emacs -## Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2014 Free Software -## Foundation, Inc. +## Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2014 +## Free Software Foundation, Inc. ## This file is part of GNU Emacs. @@ -27,8 +27,6 @@ ## Eg callproc.c only depends on w32.h for WINDOWSNT builds. ## One way to fix this would be to replace w32.h (etc) by $(W32_H), ## a variable set by configure. Does not seem worth the trouble. -## Since the w32 build does not even use this file, you might ask -## why these dependencies are here at all... ## nsgui.h: In fact, every .o file depends directly or indirectly on ## dispextern.h and hence nsgui.h under NS. But the ones that actually diff --git a/src/nsmenu.m b/src/nsmenu.m index 24c1189584b..778b068ef8b 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m @@ -1152,7 +1152,10 @@ update_frame_tool_bar (struct frame *f) FRAME_TOOLBAR_HEIGHT (f) = 0; if (view->wait_for_tool_bar && FRAME_TOOLBAR_HEIGHT (f) > 0) + { + view->wait_for_tool_bar = NO; [view setNeedsDisplay: YES]; + } unblock_input (); } diff --git a/src/nsterm.h b/src/nsterm.h index e77aca3d50d..2619b710073 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -412,7 +412,6 @@ typedef float EmacsCGFloat; - initFrame: (NSRect )r window: (Lisp_Object)win; - (void)setFrame: (NSRect)r; -- (void)dealloc; - setPosition: (int) position portion: (int) portion whole: (int) whole; - (int) checkSamePosition: (int)position portion: (int)portion diff --git a/src/nsterm.m b/src/nsterm.m index c6450804f57..f2eeeda93bf 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -283,6 +283,11 @@ static NSMutableArray *ns_pending_files, *ns_pending_service_names, static BOOL ns_do_open_file = NO; static BOOL ns_last_use_native_fullscreen; +/* Non-zero means that a HELP_EVENT has been generated since Emacs + start. */ + +static BOOL any_help_event_p = NO; + static struct { struct input_event *q; int nr, cap; @@ -5688,14 +5693,10 @@ not_in_argv (NSString *arg) /* NOTE: help_echo_{window,pos,object} are set in xdisp.c (note_mouse_highlight), which is called through the note_mouse_movement () call above */ + any_help_event_p = YES; gen_help_event (help_echo_string, frame, help_echo_window, help_echo_object, help_echo_pos); } - else - { - help_echo_string = Qnil; - gen_help_event (Qnil, frame, Qnil, Qnil, 0); - } if (emacsframe->mouse_moved && send_appdefined) ns_send_appdefined (-1); @@ -5973,6 +5974,14 @@ if (cols > 0 && rows > 0) x_set_frame_alpha (emacsframe); } + if (any_help_event_p) + { + Lisp_Object frame; + XSETFRAME (frame, emacsframe); + help_echo_string = Qnil; + gen_help_event (Qnil, frame, Qnil, Qnil, 0); + } + if (emacs_event && is_focus_frame) { [self deleteWorkingText]; @@ -7135,15 +7144,6 @@ if (cols > 0 && rows > 0) } -- (void)dealloc -{ - NSTRACE (EmacsScroller_dealloc); - if (!NILP (win)) - wset_vertical_scroll_bar (XWINDOW (win), Qnil); - [super dealloc]; -} - - - condemn { NSTRACE (condemn); @@ -7171,6 +7171,9 @@ if (cols > 0 && rows > 0) view = (EmacsView *)FRAME_NS_VIEW (frame); if (view != nil) view->scrollbarsNeedingUpdate++; + if (!NILP (win)) + wset_vertical_scroll_bar (XWINDOW (win), Qnil); + win = Qnil; [self removeFromSuperview]; [self release]; unblock_input (); diff --git a/src/w32fns.c b/src/w32fns.c index 057bc95ee94..e24148af4ff 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -96,7 +96,6 @@ static HWND hourglass_hwnd = NULL; #define IDC_HAND MAKEINTRESOURCE(32649) #endif -Lisp_Object Qsuppress_icon; Lisp_Object Qundefined_color; Lisp_Object Qcancel_timer; Lisp_Object Qfont_param; @@ -8091,7 +8090,6 @@ syms_of_w32fns (void) w32_visible_system_caret_hwnd = NULL; - DEFSYM (Qsuppress_icon, "suppress-icon"); DEFSYM (Qundefined_color, "undefined-color"); DEFSYM (Qcancel_timer, "cancel-timer"); DEFSYM (Qhyper, "hyper"); @@ -8106,8 +8104,6 @@ syms_of_w32fns (void) DEFSYM (Qworkarea, "workarea"); DEFSYM (Qmm_size, "mm-size"); DEFSYM (Qframes, "frames"); - /* This is the end of symbol initialization. */ - Fput (Qundefined_color, Qerror_conditions, listn (CONSTYPE_PURE, 2, Qundefined_color, Qerror)); diff --git a/src/xfns.c b/src/xfns.c index c3d9900207f..651d21294e3 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -125,7 +125,6 @@ extern LWLIB_ID widget_id_tick; #define MAXREQUEST(dpy) (XMaxRequestSize (dpy)) -static Lisp_Object Qsuppress_icon; static Lisp_Object Qundefined_color; static Lisp_Object Qcompound_text, Qcancel_timer; Lisp_Object Qfont_param; @@ -6137,15 +6136,10 @@ frame_parm_handler x_frame_parm_handlers[] = void syms_of_xfns (void) { - /* The section below is built by the lisp expression at the top of the file, - just above where these variables are declared. */ - /*&&& init symbols here &&&*/ - DEFSYM (Qsuppress_icon, "suppress-icon"); DEFSYM (Qundefined_color, "undefined-color"); DEFSYM (Qcompound_text, "compound-text"); DEFSYM (Qcancel_timer, "cancel-timer"); DEFSYM (Qfont_param, "font-parameter"); - /* This is the end of symbol initialization. */ Fput (Qundefined_color, Qerror_conditions, listn (CONSTYPE_PURE, 2, Qundefined_color, Qerror)); |