commit 5ba4fbd9e3cc2fc31e5ec3ae22f1695800b86d21 (HEAD, refs/remotes/origin/master) Author: Eric Abrahamsen Date: Wed Apr 1 04:55:34 2015 +0000 lisp/gnus/registry.el (registry-prune): Fix registry pruning routine diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 5b10d45..95ead23 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,9 @@ +2015-04-01 Eric Abrahamsen + + * registry.el (registry-prune): Re-use `registry-full' in + `registry-prune'. It's a bit of redundant work, but safer. + Also ensure that target-size is an integer. + 2015-03-31 Daiki Ueno * plstore.el (plstore--decrypt): Clear entry in diff --git a/lisp/gnus/registry.el b/lisp/gnus/registry.el index e4ba0bc..96a89fc 100644 --- a/lisp/gnus/registry.el +++ b/lisp/gnus/registry.el @@ -341,11 +341,12 @@ from the front of the list are deleted first. Returns the number of deleted entries." (let ((size (registry-size db)) - (target-size (- (oref db max-size) - (* (oref db max-size) - (oref db prune-factor)))) + (target-size + (floor (- (oref db max-size) + (* (oref db max-size) + (oref db prune-factor))))) candidates) - (if (> size (oref db max-size)) + (if (registry-full db) (progn (setq candidates (registry-collect-prune-candidates commit 8d1d8fc474bd9ed22cbe8b80125c8ce89dc62b57 Author: Glenn Morris Date: Tue Mar 31 17:47:14 2015 -0400 * admin/update_autogen (commit): Switch prefix from "# " to "; ". diff --git a/admin/ChangeLog b/admin/ChangeLog index 092bfa9..d3fabd4 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,6 +1,10 @@ +2015-03-31 Glenn Morris + + * update_autogen (commit): Switch prefix from "# " to "; ". + 2015-03-03 Kelvin White - * MAINTAINERS: Add myself to section 2 + * MAINTAINERS: Add myself to section 2. 2015-03-03 Glenn Morris diff --git a/admin/update_autogen b/admin/update_autogen index 73e8aeb..1bd8296 100755 --- a/admin/update_autogen +++ b/admin/update_autogen @@ -228,7 +228,7 @@ commit () echo "Committing..." - $vcs commit -m "# Auto-commit of $type files." "$@" || return $? + $vcs commit -m "; Auto-commit of $type files." "$@" || return $? [ "$vcs" = "git" ] && { $vcs push || return $? commit ee050a3b1989f1a02401599c3d67542c96aded6f Author: Simen Heggestøyl Date: Tue Mar 31 11:26:48 2015 -0700 Pete Williamson (tiny change) Add NaCl target * configure.ac: Add a target for Chromium Native Client (NaCl). diff --git a/ChangeLog b/ChangeLog index f45e32f..6df5a5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-03-27 Pete Williamson (tiny change) + + Add NaCl target + * configure.ac: Add a target for Chromium Native Client (NaCl). + 2015-03-29 Eli Zaretskii * build-aux/dir_top (File): Fix the description of selecting a diff --git a/configure.ac b/configure.ac index bed94fb..44709d4 100644 --- a/configure.ac +++ b/configure.ac @@ -612,6 +612,11 @@ case "${canonical}" in ## fi ;; + ## Chromium Native Client + *-nacl ) + opsys=nacl + ;; + ## Cygwin ports *-*-cygwin ) opsys=cygwin @@ -1263,7 +1268,7 @@ dnl The function dump-emacs will not be defined and temacs will do dnl (load "loadup") automatically unless told otherwise. test "x$CANNOT_DUMP" = "x" && CANNOT_DUMP=no case "$opsys" in - your-opsys-here) CANNOT_DUMP=yes ;; + nacl) CANNOT_DUMP=yes ;; esac if test "$CANNOT_DUMP" = "yes"; then @@ -2104,7 +2109,7 @@ hybrid_malloc= case "$opsys" in ## darwin ld insists on the use of malloc routines in the System framework. - darwin|mingw32|sol2-10) system_malloc=yes ;; + darwin | mingw32 | nacl | sol2-10) system_malloc=yes ;; cygwin) hybrid_malloc=yes;; esac @@ -4186,7 +4191,7 @@ emacs_broken_SIGIO=no case $opsys in dnl SIGIO exists, but the feature doesn't work in the way Emacs needs. dnl See eg . - hpux* | irix6-5 | openbsd | sol2* | unixware ) + hpux* | irix6-5 | nacl | openbsd | sol2* | unixware ) emacs_broken_SIGIO=yes ;; @@ -4348,7 +4353,7 @@ case $opsys in AC_DEFINE(FIRST_PTY_LETTER, ['p']) ;; - gnu-linux | gnu-kfreebsd | dragonfly | freebsd | netbsd ) + gnu-linux | gnu-kfreebsd | dragonfly | freebsd | netbsd | nacl ) dnl if HAVE_GRANTPT if test "x$ac_cv_func_grantpt" = xyes; then AC_DEFINE(UNIX98_PTYS, 1, [Define if the system has Unix98 PTYs.]) @@ -4647,7 +4652,7 @@ esac AC_CACHE_CHECK([for usable FIONREAD], [emacs_cv_usable_FIONREAD], [case $opsys in - aix4-2) + aix4-2 | nacl) dnl BUILD 9008 - FIONREAD problem still exists in X-Windows. emacs_cv_usable_FIONREAD=no ;; commit f21d9b6e4461719cece6ad4adc85ea84ddc5a4e0 Author: Simen Heggestøyl Date: Tue Mar 31 19:55:52 2015 +0200 Derive `css-mode' from `prog-mode' * textmodes/css-mode.el (css-mode): Derive from `prog-mode'. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index df66d81..621121e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2015-03-31 Simen Heggestøyl + + * textmodes/css-mode.el (css-mode): Derive from `prog-mode'. + 2015-03-31 Stefan Monnier * jit-lock.el (jit-lock--run-functions): Fix min/max copy&paste error. diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index 3e7612a..7280080 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el @@ -370,14 +370,13 @@ pseudo-classes, and at-rules." (css--complete-at-rule))) ;;;###autoload -(define-derived-mode css-mode fundamental-mode "CSS" +(define-derived-mode css-mode prog-mode "CSS" "Major mode to edit Cascading Style Sheets." (setq-local font-lock-defaults css-font-lock-defaults) (setq-local comment-start "/*") (setq-local comment-start-skip "/\\*+[ \t]*") (setq-local comment-end "*/") (setq-local comment-end-skip "[ \t]*\\*+/") - (setq-local parse-sexp-ignore-comments t) (setq-local fill-paragraph-function 'css-fill-paragraph) (setq-local add-log-current-defun-function #'css-current-defun-name) (smie-setup css-smie-grammar #'css-smie-rules commit f20a2cd9dcd9f6a62496dc2df7fe5dfc20124bd3 Author: Eli Zaretskii Date: Tue Mar 31 17:18:17 2015 +0300 Avoid crashing with key-chord (Bug#20223) src/keyboard.c (read_key_sequence): Don't let this_single_command_key_start become negative. diff --git a/src/ChangeLog b/src/ChangeLog index f0ed9e7..7c7892a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2015-03-31 Eli Zaretskii + + * keyboard.c (read_key_sequence): Don't let + this_single_command_key_start become negative. (Bug#20223) + 2015-03-29 Jan Djärv * gtkutil.c (xg_display_open): diff --git a/src/keyboard.c b/src/keyboard.c index bf65df1..2d047da 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -9591,6 +9591,18 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt, /* Record what part of this_command_keys is the current key sequence. */ this_single_command_key_start = this_command_key_count - t; + /* When 'input-method-function' called above causes events to be + put on 'unread-post-input-method-events', and as result + 'reread' is set to 'true', the value of 't' can become larger + than 'this_command_key_count', because 'add_command_key' is + not called to update 'this_command_key_count'. If this + happens, 'this_single_command_key_start' will become negative + above, and any call to 'this-single-command-keys' will return + a garbled vector. See bug #20223 for one such situation. + Here we force 'this_single_command_key_start' to never become + negative, to avoid that. */ + if (this_single_command_key_start < 0) + this_single_command_key_start = 0; /* Look for this sequence in input-decode-map. Scan from indec.end until we find a bound suffix. */ commit 5a7380aa271da0b38c387b14328bb5bb902efb01 Author: Stefan Monnier Date: Tue Mar 31 09:35:42 2015 -0400 * lisp/jit-lock.el (jit-lock--run-functions): Fix min/max copy&paste error. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e50c69b..df66d81 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2015-03-31 Stefan Monnier + * jit-lock.el (jit-lock--run-functions): Fix min/max copy&paste error. + Let jit-lock know the result of font-lock-extend-region-functions. * jit-lock.el (jit-lock--run-functions): New function. (jit-lock-fontify-now): Use it. Handle fontification bounds more diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el index 5fe2232..0faabeb 100644 --- a/lisp/jit-lock.el +++ b/lisp/jit-lock.el @@ -369,8 +369,8 @@ is active." ;; already run to avoid running them redundantly when we get to ;; those chunks. (setq tight-beg (max (or tight-beg (point-min)) this-beg)) - (setq tight-end (max (or tight-end (point-max)) this-end)) - (setq loose-beg (max loose-beg this-beg)) + (setq tight-end (min (or tight-end (point-max)) this-end)) + (setq loose-beg (min loose-beg this-beg)) (setq loose-end (max loose-end this-end)) nil))) `(,(min tight-beg beg) ,(max tight-end end) ,loose-beg ,loose-end))) @@ -417,7 +417,8 @@ Defaults to the whole buffer. END can be out of bounds." (quit (put-text-property start next 'fontified nil) (signal (car err) (cdr err)))))) - ;; In case we fontified more than requested, take note. + ;; In case we fontified more than requested, take advantage of the + ;; good news. (when (or (< tight-beg start) (> tight-end next)) (put-text-property tight-beg tight-end 'fontified t))