Now on revision 112251. ------------------------------------------------------------ revno: 112251 committer: Ken Brown branch nick: trunk timestamp: Mon 2013-04-08 22:38:56 -0400 message: Fix icon for the cygw32 build on 64-bit Cygwin. (Bug#12993) * nt/emacs.rc: Use 64-bit manifest for 64-bit Cygwin build. * configure.ac (W32_RES_LINK): Remove unnecessary linker directive `-Wl,-bpe-i386', which is confusing in the 64-bit case. diff: === modified file 'ChangeLog' --- ChangeLog 2013-04-07 06:21:40 +0000 +++ ChangeLog 2013-04-09 02:38:56 +0000 @@ -1,3 +1,9 @@ +2013-04-09 Ken Brown + + * configure.ac (W32_RES_LINK): Remove unneeded linker directive + `-Wl,-bpe-i386', which is confusing in the 64-bit case. + (Bug#12993) + 2013-04-07 Paul Eggert Fix --enable-profiling bug introduced by 2013-02-25 change (Bug#13783). === modified file 'configure.ac' --- configure.ac 2013-04-07 06:21:40 +0000 +++ configure.ac 2013-04-09 02:38:56 +0000 @@ -1527,7 +1527,7 @@ W32_RES="emacs.res" # Tell the linker that emacs.res is an object (which we compile from # the rc file), not a linker script. - W32_RES_LINK="-Wl,-bpe-i386 -Wl,emacs.res" + W32_RES_LINK="-Wl,emacs.res" fi AC_SUBST(W32_OBJ) AC_SUBST(W32_LIBS) === modified file 'nt/ChangeLog' --- nt/ChangeLog 2013-04-01 07:28:56 +0000 +++ nt/ChangeLog 2013-04-09 02:38:56 +0000 @@ -1,3 +1,8 @@ +2013-04-09 Ken Brown + + * emacs.rc: Use 64-bit manifest for 64-bit Cygwin build. + (Bug#12993) + 2013-04-01 Eli Zaretskii * README: A better documentation of ddeclient.exe. === modified file 'nt/emacs.rc' --- nt/emacs.rc 2013-03-05 03:59:35 +0000 +++ nt/emacs.rc 2013-04-09 02:38:56 +0000 @@ -1,6 +1,6 @@ Emacs ICON icons/emacs.ico 32649 CURSOR icons/hand.cur -#ifdef WIN64 +#if defined (WIN64) || defined (__x86_64__) 1 24 "emacs-x64.manifest" #else 1 24 "emacs-x86.manifest" ------------------------------------------------------------ revno: 112250 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14161 committer: Stefan Monnier branch nick: trunk timestamp: Mon 2013-04-08 14:04:58 -0400 message: * src/window.c (select_window): Don't record_buffer while the invariant is temporarily broken. * src/fns.c (Fdelq): Don't assume !NILP => CONSP. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-04-07 16:18:41 +0000 +++ src/ChangeLog 2013-04-08 18:04:58 +0000 @@ -1,3 +1,10 @@ +2013-04-08 Stefan Monnier + + * window.c (select_window): Don't record_buffer while the invariant is + temporarily broken (bug#14161). + + * fns.c (Fdelq): Don't assume !NILP => CONSP. + 2013-04-07 Eli Zaretskii * fileio.c (ACL_NOT_WELL_SUPPORTED): Define macro for WINDOWSNT. === modified file 'src/fns.c' --- src/fns.c 2013-04-07 04:41:19 +0000 +++ src/fns.c 2013-04-08 18:04:58 +0000 @@ -1551,7 +1551,7 @@ tail = list; prev = Qnil; - while (!NILP (tail)) + while (CONSP (tail)) { CHECK_LIST_CONS (tail, list); tem = XCAR (tail); === modified file 'src/keyboard.c' --- src/keyboard.c 2013-03-29 15:50:21 +0000 +++ src/keyboard.c 2013-04-08 18:04:58 +0000 @@ -72,7 +72,7 @@ #include TERM_HEADER #endif /* HAVE_WINDOW_SYSTEM */ -/* Variables for blockinput.h: */ +/* Variables for blockinput.h: */ /* Positive if interrupt input is blocked right now. */ volatile int interrupt_input_blocked; @@ -4337,10 +4337,10 @@ } idle_timer_ripe = EMACS_TIME_LE (idle_timer_time, idleness_now); - idle_timer_difference = - (idle_timer_ripe - ? sub_emacs_time (idleness_now, idle_timer_time) - : sub_emacs_time (idle_timer_time, idleness_now)); + idle_timer_difference + = (idle_timer_ripe + ? sub_emacs_time (idleness_now, idle_timer_time) + : sub_emacs_time (idle_timer_time, idleness_now)); } /* Decide which timer is the next timer, === modified file 'src/window.c' --- src/window.c 2013-04-02 01:54:56 +0000 +++ src/window.c 2013-04-08 18:04:58 +0000 @@ -485,12 +485,6 @@ w = XWINDOW (window); w->frozen_window_start_p = 0; - if (NILP (norecord)) - { - w->use_time = ++window_select_count; - record_buffer (w->contents); - } - /* Make the selected window's buffer current. */ Fset_buffer (w->contents); @@ -515,6 +509,15 @@ select_window_1 (window, inhibit_point_swap); + /* record_buffer can run QUIT, so make sure it is run only after we have + re-established the invariant between selected_window and selected_frame, + otherwise the temporary broken invariant might "escape" (bug#14161). */ + if (NILP (norecord)) + { + w->use_time = ++window_select_count; + record_buffer (w->contents); + } + bset_last_selected_window (XBUFFER (w->contents), window); windows_or_buffers_changed++; return window; @@ -2929,7 +2932,7 @@ replace_window (root, window, 1); - /* This must become SWINDOW anyway ....... */ + /* This must become SWINDOW anyway ....... */ if (BUFFERP (w->contents) && !resize_failed) { /* Try to minimize scrolling, by setting the window start to the ------------------------------------------------------------ revno: 112249 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14144 committer: Stefan Monnier branch nick: trunk timestamp: Sun 2013-04-07 22:21:59 -0400 message: * lisp/emacs-lisp/edebug.el (edebug-mode): Fix typo. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-04-08 02:08:45 +0000 +++ lisp/ChangeLog 2013-04-08 02:21:59 +0000 @@ -1,5 +1,7 @@ 2013-04-08 Stefan Monnier + * emacs-lisp/edebug.el (edebug-mode): Fix typo (bug#14144). + * emacs-lisp/timer.el (timer-event-handler): Don't retrigger a canceled timer (bug#14156). === modified file 'lisp/emacs-lisp/edebug.el' --- lisp/emacs-lisp/edebug.el 2013-04-01 07:58:04 +0000 +++ lisp/emacs-lisp/edebug.el 2013-04-08 02:21:59 +0000 @@ -3814,7 +3814,7 @@ (remove-hook 'kill-buffer-hook 'edebug-kill-buffer t)) (pcase-dolist (`(,var . ,val) '((buffer-read-only . t))) (push - (if (local-variable-p var) var (cons var (symbol-value var))) + (if (local-variable-p var) (cons var (symbol-value var)) var) edebug--mode-saved-vars) (set (make-local-variable var) val)) ;; Append `edebug-kill-buffer' to the hook to avoid interfering with