------------------------------------------------------------ revno: 117725 committer: Alan Mackenzie branch nick: trunk timestamp: Sat 2014-08-23 11:02:20 +0000 message: progmodes/cc-fonts.el (c-font-lock-declarators): Fix infinite loop, bug #18306. The bug was introduced on 2014-08-02. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-08-21 15:07:13 +0000 +++ lisp/ChangeLog 2014-08-23 11:02:20 +0000 @@ -1,3 +1,8 @@ +2014-08-23 Alan Mackenzie + + * progmodes/cc-fonts.el (c-font-lock-declarators): Fix infinite + loop, bug #18306. The bug was introduced on 2014-08-02. + 2014-08-21 Eli Zaretskii * textmodes/texnfo-upd.el (texinfo-specific-section-type): Don't === modified file 'lisp/progmodes/cc-fonts.el' --- lisp/progmodes/cc-fonts.el 2014-08-09 20:54:04 +0000 +++ lisp/progmodes/cc-fonts.el 2014-08-23 11:02:20 +0000 @@ -1116,14 +1116,11 @@ ;; initializing brace lists. (let (found) (while - (and (setq found - (c-syntactic-re-search-forward - "[;,]\\|\\s)\\|\\'\\|\\(=\\|\\s(\\)" limit t t)) - (eq (char-before) ?\[)) - (backward-char) - (c-safe (c-forward-sexp 1)) - (setq found nil) - (setq brackets-after-id t)) + (and (setq found (c-syntactic-re-search-forward + "[;,]\\|\\s)\\|\\'\\|\\(=\\|\\s(\\)" limit t t)) + (eq (char-before) ?\[) + (c-go-up-list-forward)) + (setq brackets-after-id t)) found)) (setq next-pos (match-beginning 0) ------------------------------------------------------------ revno: 117724 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2014-08-23 12:14:13 +0300 message: configure.ac: Comment fix. diff: === modified file 'configure.ac' --- configure.ac 2014-08-23 08:48:30 +0000 +++ configure.ac 2014-08-23 09:14:13 +0000 @@ -139,7 +139,7 @@ canonical=$host configuration=${host_alias-${build_alias-$host}} -dnl We get MINGW64 with MSYS2. +dnl We get MINGW64 with MSYS2, MINGW32 with MSYS. case $canonical in *-mingw*) . $srcdir/nt/mingw-cfg.site ------------------------------------------------------------ revno: 117723 fixes bug: http://debbugs.gnu.org/18302 author: Karol Ostrovsky committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2014-08-23 11:48:30 +0300 message: Fix bug #18302 with minor issues in the MSYS2/MinGW64 build. configure.ac: Accept "*-mingw*", not just "*-mingw32", as canonical name of a MinGW build, because using MSYS2 'uname' produces "MINGW64". src/Makefile.in (emacs$(EXEEXT)): Retry deletion of bootstrap-emacs if the initial "rm -f" fails. This is for MinGW builds, where MS-Windows will not allow deleting the executable file of a running program. diff: === modified file 'ChangeLog' --- ChangeLog 2014-08-21 21:52:26 +0000 +++ ChangeLog 2014-08-23 08:48:30 +0000 @@ -1,3 +1,9 @@ +2014-08-23 Karol Ostrovsky (tiny change) + + * configure.ac: Accept "*-mingw*", not just "*-mingw32", as + canonical name of a MinGW build, because using MSYS2 'uname' + produces "MINGW64". + 2014-08-21 Ken Brown * configure.ac (HAVE_XPM): Explain the use of CPPFLAGS in the === modified file 'configure.ac' --- configure.ac 2014-08-21 21:52:26 +0000 +++ configure.ac 2014-08-23 08:48:30 +0000 @@ -650,7 +650,7 @@ i[3456]86-*-* ) case "${canonical}" in *-darwin* ) opsys=darwin ;; - *-mingw32 ) + *-mingw* ) opsys=mingw32 # MinGW overrides and adds some system headers in nt/inc. GCC_TEST_OPTIONS="-I $srcdir/nt/inc" @@ -665,7 +665,7 @@ # MinGW64 x86_64-*-* ) case "${canonical}" in - *-mingw32 ) + *-mingw* ) opsys=mingw32 # MinGW overrides and adds some system headers in nt/inc. GCC_TEST_OPTIONS="-I $srcdir/nt/inc" @@ -1323,7 +1323,7 @@ C_SWITCH_SYSTEM="-ma -qmaxmem=4000" if test "$opsys" = "mingw32"; then case "$canonical" in - x86_64-*-mingw32) C_SWITCH_SYSTEM="-mtune=generic" ;; + x86_64-*-mingw*) C_SWITCH_SYSTEM="-mtune=generic" ;; *) C_SWITCH_SYSTEM="-mtune=pentium4" ;; esac fi === modified file 'src/ChangeLog' --- src/ChangeLog 2014-08-20 14:41:15 +0000 +++ src/ChangeLog 2014-08-23 08:48:30 +0000 @@ -1,3 +1,10 @@ +2014-08-23 Karol Ostrovsky (tiny change) + + * Makefile.in (emacs$(EXEEXT)): Retry deletion of bootstrap-emacs + if the initial "rm -f" fails. This is for MinGW builds, where + MS-Windows will not allow deleting the executable file of a + running program. + 2014-08-20 Eli Zaretskii * w32term.c (w32_scroll_bar_handle_click) === modified file 'src/Makefile.in' --- src/Makefile.in 2014-07-13 15:50:35 +0000 +++ src/Makefile.in 2014-08-23 08:48:30 +0000 @@ -435,7 +435,9 @@ else \ LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump || exit 1; \ test "X$(PAXCTL)" = X || $(PAXCTL) -zex emacs$(EXEEXT); \ - rm -f bootstrap-emacs$(EXEEXT); \ + while test -f bootstrap-emacs$(EXEEXT); do \ + rm -f bootstrap-emacs$(EXEEXT); \ + done; \ ln emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \ fi ------------------------------------------------------------ revno: 117722 committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2014-08-21 23:02:23 +0000 message: lisp/gnus/mm-view.el (mm-display-inline-fontify): Make the working buffer temporarily displayed when running a mode function (at least org-mode requires it) diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2014-08-14 11:31:23 +0000 +++ lisp/gnus/ChangeLog 2014-08-21 23:02:23 +0000 @@ -1,3 +1,9 @@ +2014-08-21 Katsumi Yamaoka + + * mm-view.el (mm-display-inline-fontify): Make the working buffer + temporarily displayed when running a mode function (at least org-mode + requires it). + 2014-08-14 Alan Schmitt * gnus-sum.el (gnus-summary-expire-articles): Functions registered to === modified file 'lisp/gnus/mm-view.el' --- lisp/gnus/mm-view.el 2014-06-05 04:31:36 +0000 +++ lisp/gnus/mm-view.el 2014-08-21 23:02:23 +0000 @@ -513,7 +513,9 @@ (set (make-local-variable 'enable-local-variables) nil) (with-demoted-errors (if mode - (funcall mode) + (save-window-excursion + (switch-to-buffer (current-buffer)) + (funcall mode)) (let ((auto-mode-alist (delq (rassq 'doc-view-mode-maybe auto-mode-alist) (copy-sequence auto-mode-alist))))