commit 5a7fb4f0cc5a21808ab6fa062050059ceac027e4 (HEAD, refs/remotes/origin/master) Author: Eli Zaretskii Date: Sat Jun 27 11:00:38 2015 +0300 Avoid error in TLS connections due to incorrect format * src/gnutls.c (Fgnutls_boot): Use the %x conversion specifier in the call to 'error', instead of the unsupported %u. Reported by lo2net . (Bug#20908) diff --git a/src/gnutls.c b/src/gnutls.c index cab2404..864cac5 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -1512,7 +1512,7 @@ one trustfile (usually a CA bundle). */) || !NILP (Fmember (QCgnutls_bootprop_trustfiles, verify_error))) { emacs_gnutls_deinit (proc); - error ("Certificate validation failed %s, verification code %u", + error ("Certificate validation failed %s, verification code %x", c_hostname, peer_verification); } else commit 45fd93603747b64223291450ad89cf5a647f6701 Author: Glenn Morris Date: Fri Jun 26 20:25:31 2015 -0400 ; * etc/NEWS: Placeholder entry for recent prog-mode changes. diff --git a/etc/NEWS b/etc/NEWS index aeb42bf..ae62e76 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -287,6 +287,9 @@ standards. * Changes in Specialized Modes and Packages in Emacs 25.1 +** Prog mode has some support for multi-mode indentation. +See `prog-indentation-context' and `prog-widen'. + ** New `xterm-screen-extra-capabilities' config. ** The `save-place' variable is replaced by a `save-place-mode'. commit aa2da6ef104b0abf0ee310c9c96ee5451d01bff5 Author: Artur Malabarba Date: Fri Jun 26 19:01:50 2015 +0100 * lisp/replace.el (replace-search): Fix regexp case (bug#20901) diff --git a/lisp/replace.el b/lisp/replace.el index 65a2b41..41debdd 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -2014,6 +2014,7 @@ It is called with three arguments, as if it were (let* ((isearch-regexp regexp-flag) (isearch-word (or delimited-flag (and replace-character-fold + (not regexp-flag) #'character-fold-to-regexp))) (isearch-lax-whitespace replace-lax-whitespace) commit ff80437668dd0d5163c9e43f0c200b923b39166b Merge: bde6168 1546c6f Author: Eli Zaretskii Date: Fri Jun 26 13:04:28 2015 +0300 Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs commit 1546c6f2b399de3dccd65bd5bdbcf1c2b7d32b04 Author: Leo Liu Date: Fri Jun 26 18:02:30 2015 +0800 Fix indentation for with-output-to-string * lisp/emacs-lisp/cl-indent.el: Fix indentation for `with-output-to-string' in elisp. Revert "lisp/emacs-lisp/cl-indent.el: Fix indent of with-output-to-string" This reverts commit 659199f2ca5f283fb246faa78a244e5ca25f53dd. diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el index 9314419..5134e50 100644 --- a/lisp/emacs-lisp/cl-indent.el +++ b/lisp/emacs-lisp/cl-indent.el @@ -827,7 +827,7 @@ optional\\|rest\\|key\\|allow-other-keys\\|aux\\|whole\\|body\\|environment\ (with-accessors . multiple-value-bind) (with-condition-restarts . multiple-value-bind) (with-compilation-unit (&lambda &body)) - (with-output-to-string 0) + (with-output-to-string (4 2)) (with-slots . multiple-value-bind) (with-standard-io-syntax (2))))) (dolist (el l) @@ -839,6 +839,7 @@ optional\\|rest\\|key\\|allow-other-keys\\|aux\\|whole\\|body\\|environment\ ;; In elisp, the else part of `if' is in an implicit progn, so indent ;; it more. (put 'if 'common-lisp-indent-function-for-elisp 2) +(put 'with-output-to-string 'common-lisp-indent-function-for-elisp 0) ;(defun foo (x) commit bde61680abe71059b60a37868a804adf3d819678 Author: Eli Zaretskii Date: Fri Jun 26 13:03:02 2015 +0300 Minor corrections in ELisp manual * doc/lispref/nonascii.texi (Character Properties): Correct inaccuracies in description of values of the Unicode properties. diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi index 362c3a4..8781cd6 100644 --- a/doc/lispref/nonascii.texi +++ b/doc/lispref/nonascii.texi @@ -474,32 +474,36 @@ inside @samp{<..>} brackets, but the tag names in Emacs do not include the brackets; e.g., Unicode specifies @samp{} where Emacs uses @samp{small}. }; the other elements are characters that give the compatibility decomposition sequence of this character. For -unassigned codepoints, the value is the character itself. +characters that don't have decomposition sequences, and for unassigned +codepoints, the value is a list with a single member, the character +itself. @item decimal-digit-value Corresponds to the Unicode @code{Numeric_Value} property for characters whose @code{Numeric_Type} is @samp{Decimal}. The value is -an integer. For unassigned codepoints, the value is -@code{nil}, which means @acronym{NaN}, or ``not-a-number''. +an integer, or @code{nil} if the character has no decimal digit value. +For unassigned codepoints, the value is @code{nil}, which means +@acronym{NaN}, or ``not-a-number''. @item digit-value Corresponds to the Unicode @code{Numeric_Value} property for characters whose @code{Numeric_Type} is @samp{Digit}. The value is an -integer. Examples of such characters include compatibility -subscript and superscript digits, for which the value is the -corresponding number. For unassigned codepoints, the value is -@code{nil}, which means @acronym{NaN}. +integer. Examples of such characters include compatibility subscript +and superscript digits, for which the value is the corresponding +number. For characters that don't have any numeric value, and for +unassigned codepoints, the value is @code{nil}, which means +@acronym{NaN}. @item numeric-value Corresponds to the Unicode @code{Numeric_Value} property for characters whose @code{Numeric_Type} is @samp{Numeric}. The value of -this property is a number. Examples of -characters that have this property include fractions, subscripts, -superscripts, Roman numerals, currency numerators, and encircled -numbers. For example, the value of this property for the character -@code{U+2155} (@sc{vulgar fraction one fifth}) is @code{0.2}. For -unassigned codepoints, the value is @code{nil}, which means -@acronym{NaN}. +this property is a number. Examples of characters that have this +property include fractions, subscripts, superscripts, Roman numerals, +currency numerators, and encircled numbers. For example, the value of +this property for the character @code{U+2155} (@sc{vulgar fraction one +fifth}) is @code{0.2}. For characters that don't have any numeric +value, and for unassigned codepoints, the value is @code{nil}, which +means @acronym{NaN}. @cindex mirroring of characters @item mirrored @@ -545,7 +549,8 @@ value for this property, the value is @code{nil}. @item iso-10646-comment Corresponds to the Unicode @code{ISO_Comment} property. The value is -a string. For unassigned codepoints, the value is an empty string. +either a string or @code{nil}. For unassigned codepoints, the value +is @code{nil}. @item uppercase Corresponds to the Unicode @code{Simple_Uppercase_Mapping} property.