commit 4de97eafb36a155e520c27e2dee7e068e52f099b (HEAD, refs/remotes/origin/master) Author: Ulrich Müller Date: Sat Apr 4 10:10:11 2015 +0200 configure.ac: Update comment. diff --git a/configure.ac b/configure.ac index c504ed4..d692530 100644 --- a/configure.ac +++ b/configure.ac @@ -5031,7 +5031,8 @@ case "$opsys" in *) LD_SWITCH_SYSTEM_TEMACS= ;; esac -# -nopie fixes a temacs segfault on Gentoo for some reason (Bug#18784). +# -nopie fixes a temacs segfault on Gentoo, OpenBSD, and other systems +# with "hardened" GCC configurations for some reason (Bug#18784). # We don't know why -nopie works, but not segfaulting is better than # segfaulting. Use -Werror when trying -nopie, otherwise clang keeps # warning that it does not understand -nopie. commit 95ef69e7468e598d6f4ae875f683b3996ecc02eb Author: Paul Eggert Date: Fri Apr 3 13:05:23 2015 -0700 Port 'configure' to clang 3.5 * configure.ac: Add -Wno-unknown-attributes if clang; otherwise clang 3.5.0 (Fedora 21 x86-64) complains "/usr/include/glib-2.0/glib/gmem.h: ... warning: unknown attribute '__alloc_size__' ignored". Use -Werror when checking for -nopie; otherwise clang warns about -nopie instead of failing, and then later it warns everytime the build uses -nopie. diff --git a/ChangeLog b/ChangeLog index 030ef37..7746605 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2015-04-03 Paul Eggert + + Port 'configure' to clang 3.5 + * configure.ac: Add -Wno-unknown-attributes if clang; otherwise + clang 3.5.0 (Fedora 21 x86-64) complains + "/usr/include/glib-2.0/glib/gmem.h: ... warning: unknown attribute + '__alloc_size__' ignored". Use -Werror when checking for -nopie; + otherwise clang warns about -nopie instead of failing, and then + later it warns everytime the build uses -nopie. + 2015-04-03 Ulrich Müller * configure.ac (LD_SWITCH_SYSTEM_TEMACS): Add -nopie option if it diff --git a/configure.ac b/configure.ac index d2a9b37..c504ed4 100644 --- a/configure.ac +++ b/configure.ac @@ -883,6 +883,7 @@ if test "$gl_gcc_warnings" != yes; then gl_WARN_ADD([-Wno-tautological-constant-out-of-range-compare]) gl_WARN_ADD([-Wno-pointer-sign]) gl_WARN_ADD([-Wno-string-plus-int]) + gl_WARN_ADD([-Wno-unknown-attributes]) fi else isystem='-isystem ' @@ -5030,16 +5031,22 @@ case "$opsys" in *) LD_SWITCH_SYSTEM_TEMACS= ;; esac -AC_CACHE_CHECK([whether the linker accepts -nopie], +# -nopie fixes a temacs segfault on Gentoo for some reason (Bug#18784). +# We don't know why -nopie works, but not segfaulting is better than +# segfaulting. Use -Werror when trying -nopie, otherwise clang keeps +# warning that it does not understand -nopie. +AC_CACHE_CHECK([whether $CC 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]) + [emacs_save_CFLAGS=$CFLAGS + emacs_save_LDFLAGS=$LDFLAGS + CFLAGS="$CFLAGS -Werror" + LDFLAGS="$LDFLAGS -nopie" + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], + [emacs_cv_prog_cc_nopie=yes], + [emacs_cv_prog_cc_nopie=no]) + CFLAGS=$emacs_save_CFLAGS + 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 commit 8596eb1282c4d5bdb22b20c155183b39fdc8eb00 Author: Michael Albinus Date: Fri Apr 3 18:52:27 2015 +0200 Fix Bug#20249 Fixes: debbugs:20249 * net/tramp-cache.el (tramp-flush-file-property) (tramp-flush-directory-property): Use `directory-file-name' of the truename. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7a4293b..5757317 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-04-03 Michael Albinus + + * net/tramp-cache.el (tramp-flush-file-property) + (tramp-flush-directory-property): Use `directory-file-name' of the + truename. (Bug#20249) + 2015-04-03 Nicolas Richard * pcmpl-unix.el (pcmpl-ssh-known-hosts): Use `char-before' instead diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el index 1e24ea5..155053c 100644 --- a/lisp/net/tramp-cache.el +++ b/lisp/net/tramp-cache.el @@ -168,14 +168,16 @@ Returns VALUE." ;;;###tramp-autoload (defun tramp-flush-file-property (key file) "Remove all properties of FILE in the cache context of KEY." - ;; Remove file properties of symlinks. - (let ((truename (tramp-get-file-property key file "file-truename" nil))) + (let* ((file (tramp-run-real-handler + 'directory-file-name (list file))) + (truename (tramp-get-file-property key file "file-truename" nil))) + ;; Remove file properties of symlinks. (when (and (stringp truename) - (not (string-equal file truename))) + (not (string-equal file (directory-file-name truename)))) (tramp-flush-file-property key truename))) ;; Unify localname. (setq key (copy-sequence key)) - (aset key 3 (tramp-run-real-handler 'directory-file-name (list file))) + (aset key 3 file) (tramp-message key 8 "%s" file) (remhash key tramp-cache-data)) @@ -188,7 +190,7 @@ Remove also properties of all files in subdirectories." (truename (tramp-get-file-property key directory "file-truename" nil))) ;; Remove file properties of symlinks. (when (and (stringp truename) - (not (string-equal directory truename))) + (not (string-equal directory (directory-file-name truename)))) (tramp-flush-directory-property key truename)) (tramp-message key 8 "%s" directory) (maphash commit c775195c62843deed10e7967e488b3b04b84c412 Author: Jan D Date: Fri Apr 3 13:59:05 2015 +0200 Don't optimized away tool tip redraw, may lead to corrupted text. * src/xterm.c (handle_one_xevent): Always redraw tool tips on MapNotify. Update tool tip frame sizes on ConfigureNotify. diff --git a/src/ChangeLog b/src/ChangeLog index 7c7892a..09225f2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2015-04-03 Jan Djärv + + * xterm.c (handle_one_xevent): Always redraw tool tips on + MapNotify. Update tool tip frame sizes on ConfigureNotify. + 2015-03-31 Eli Zaretskii * keyboard.c (read_key_sequence): Don't let diff --git a/src/xterm.c b/src/xterm.c index bdc85ae..e904343 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -7010,11 +7010,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. */ @@ -7544,6 +7539,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); commit 7c691f32f78303750d29972a29dcc6754fae257a Author: Nicolas Richard Date: Fri Apr 3 12:28:40 2015 +0200 pcmpl-ssh-known-hosts: Use `char-before' instead of `looking-back'. Fixes: debbugs:17284 * lisp/pcmpl-unix.el (pcmpl-ssh-known-hosts): Use `char-before' instead of `looking-back'. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b004a2b..7a4293b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-04-03 Nicolas Richard + + * pcmpl-unix.el (pcmpl-ssh-known-hosts): Use `char-before' instead + of `looking-back' (bug#17284). + 2015-04-03 Dmitry Gutov * progmodes/js.el (js-indent-line): Do nothing when bol is inside diff --git a/lisp/pcmpl-unix.el b/lisp/pcmpl-unix.el index 3598cd6..7be57e9 100644 --- a/lisp/pcmpl-unix.el +++ b/lisp/pcmpl-unix.el @@ -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))))) commit 2d45a5be18ee61e23dfe6af4e23f1eda3595b22c Author: Ulrich Müller Date: Mon Mar 16 17:09:54 2015 +0100 configure.ac: Add -nopie to LD_SWITCH_SYSTEM_TEMACS. * configure.ac (LD_SWITCH_SYSTEM_TEMACS): Add -nopie option if it is supported, in order to avoid segfaults in temacs. (Bug#18784) diff --git a/ChangeLog b/ChangeLog index 6df5a5a..030ef37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-04-03 Ulrich Müller + + * 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 (tiny change) Add NaCl target diff --git a/configure.ac b/configure.ac index 44709d4..d2a9b37 100644 --- a/configure.ac +++ b/configure.ac @@ -5027,11 +5027,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) ;;