procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into cairo, fixes tooltips not shown.

Browse source
This commit is contained in:
Jan D 2015-04-03 14:02:13 +02:00
commit fb77948660
6 changed files with 41 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2015-04-03 Ulrich Müller <ulm@gentoo.org>
* configure.ac (LD_SWITCH_SYSTEM_TEMACS): Add -nopie option if it
is supported, in order to avoid segfaults in temacs. (Bug#18784)
2015-03-27 Pete Williamson <petewil@chromium.org> (tiny change)
Add NaCl target

15
configure.ac
View file

@ -5055,11 +5055,22 @@ case "$opsys" in
esac
;;
openbsd) LD_SWITCH_SYSTEM_TEMACS='-nopie' ;;
*) LD_SWITCH_SYSTEM_TEMACS= ;;
esac
AC_CACHE_CHECK([whether the linker accepts -nopie],
[emacs_cv_prog_cc_nopie],
[emacs_save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -nopie"
AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
[emacs_cv_prog_cc_nopie=yes],
[emacs_cv_prog_cc_nopie=no])
LDFLAGS=$emacs_save_LDFLAGS])
if test "$emacs_cv_prog_cc_nopie" = yes; then
# Disable PIE to avoid segfaults in temacs (bug#18784)
LD_SWITCH_SYSTEM_TEMACS="$LD_SWITCH_SYSTEM_TEMACS -nopie"
fi
if test x$ac_enable_profiling != x ; then
case $opsys in
*freebsd | gnu-linux) ;;

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2015-04-03 Nicolas Richard <theonewiththeevillook@yahoo.fr>
* pcmpl-unix.el (pcmpl-ssh-known-hosts): Use `char-before' instead
of `looking-back' (bug#17284).
2015-04-03 Dmitry Gutov <dgutov@yandex.ru>
* progmodes/js.el (js-indent-line): Do nothing when bol is inside

2
lisp/pcmpl-unix.el
View file

@ -157,7 +157,7 @@ documentation), this function returns nil."
(while (re-search-forward (concat "^ *" host-re) nil t)
(add-to-list 'ssh-hosts-list (concat (match-string 1)
(match-string 2)))
(while (and (looking-back ",")
(while (and (eq (char-before) ?,)
(re-search-forward host-re (line-end-position) t))
(add-to-list 'ssh-hosts-list (concat (match-string 1)
(match-string 2)))))

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2015-04-03 Jan Djärv <jan.h.d@swipnet.se>
* xterm.c (handle_one_xevent): Always redraw tool tips on
MapNotify. Update tool tip frame sizes on ConfigureNotify.
2015-03-31 Eli Zaretskii <eliz@gnu.org>
* keyboard.c (read_key_sequence): Don't let

17
src/xterm.c
View file

@ -7792,11 +7792,6 @@ handle_one_xevent (struct x_display_info *dpyinfo,
goto OTHER;
case MapNotify:
if (event->xmap.window == tip_window)
/* The tooltip has been drawn already. Avoid
the SET_FRAME_GARBAGED below. */
goto OTHER;
/* We use x_top_window_to_frame because map events can
come for sub-windows and they don't mean that the
frame is visible. */
@ -8330,6 +8325,18 @@ handle_one_xevent (struct x_display_info *dpyinfo,
{
x_net_wm_state (f, event->xconfigure.window);
#ifdef USE_X_TOOLKIT
/* Tip frames are pure X window, set size for them. */
if (! NILP (tip_frame) && XFRAME (tip_frame) == f)
{
if (FRAME_PIXEL_HEIGHT (f) != event->xconfigure.height
|| FRAME_PIXEL_WIDTH (f) != event->xconfigure.width)
SET_FRAME_GARBAGED (f);
FRAME_PIXEL_HEIGHT (f) = event->xconfigure.height;
FRAME_PIXEL_WIDTH (f) = event->xconfigure.width;
}
#endif
#ifndef USE_X_TOOLKIT
#ifndef USE_GTK
int width = FRAME_PIXEL_TO_TEXT_WIDTH (f, event->xconfigure.width);