From 49241268b242b23ad85fb19c264f17a104799b22 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 10 Feb 2012 00:38:22 -0800 Subject: [PATCH] * src/fns.c (Fsecure_hash): Doc fix. * etc/NEWS: Related edit. --- etc/NEWS | 7 +++---- src/ChangeLog | 4 ++++ src/fns.c | 15 +++++++++------ 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 407f1edeaf6..816c636fdf7 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -408,10 +408,9 @@ in the corresponding way. +++ ** The variable `focus-follows-mouse' now always defaults to nil. -** New primitive `secure-hash' that supports many secure hash algorithms -including md5, sha-1 and sha-2 (sha-224, sha-256, sha-384 and sha-512). -The elisp implementation sha1.el is removed. Feature sha1 is provided -by default. +** New primitive `secure-hash' that supports many secure hash algorithms: +md5, sha1, sha2, sha224, sha256, sha384, and sha512. The lisp library +sha1.el has been removed. The `sha1' feature is provided by default. ** Menu-bar changes --- diff --git a/src/ChangeLog b/src/ChangeLog index dfd0a05df35..61828474d5e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-02-10 Glenn Morris + + * fns.c (Fsecure_hash): Doc fix. + 2012-02-09 Kenichi Handa * coding.c (produce_chars): Fix updating of src_end (Bug#10701). diff --git a/src/fns.c b/src/fns.c index 2c9ce915ae5..1edfe966098 100644 --- a/src/fns.c +++ b/src/fns.c @@ -4847,12 +4847,15 @@ guesswork fails. Normally, an error is signaled in such case. */) } DEFUN ("secure-hash", Fsecure_hash, Ssecure_hash, 2, 5, 0, - doc: /* Return the secure hash of an OBJECT. -ALGORITHM is a symbol: md5, sha1, sha224, sha256, sha384 or sha512. -OBJECT is either a string or a buffer. -Optional arguments START and END are character positions specifying -which portion of OBJECT for computing the hash. If BINARY is non-nil, -return a string in binary form. */) + doc: /* Return the secure hash of OBJECT, a buffer or string. +ALGORITHM is a symbol specifying the hash to use: +md5, sha1, sha224, sha256, sha384 or sha512. + +The two optional arguments START and END are positions specifying for +which part of OBJECT to compute the hash. If nil or omitted, uses the +whole OBJECT. + +If BINARY is non-nil, returns a string in binary form. */) (Lisp_Object algorithm, Lisp_Object object, Lisp_Object start, Lisp_Object end, Lisp_Object binary) { return secure_hash (algorithm, object, start, end, Qnil, Qnil, binary); -- 2.11.4.GIT