diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2023-02-12 03:27:46 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2023-02-12 03:27:46 +0100 |
| commit | 08bd066149faee95fe6660d5002306a1dbc4b91b (patch) | |
| tree | 6fc5a9ecbcee5b59aa377fa90f7f729a0a8c6e31 /lisp/subr.el | |
| parent | 14c97db7366435b1edbf2854f485058a9d7c6071 (diff) | |
| parent | 4da398d8b57aae740f054b4d04cba72735a4044c (diff) | |
| download | emacs-08bd066149faee95fe6660d5002306a1dbc4b91b.tar.gz | |
Merge from origin/emacs-29
4da398d8b57 ; Fix typos
074008ee2d2 ; Fix doc strings in lisp/image/ directory
2d1e43436da ; Improve documentation of hash functions.
900f7e07275 ; Remove extraneous local variables from image-dired-*.el...
4f053afe8e7 bug-reference: prevent match-data clobbering (bug#61395)
10af9fbcad1 ; * admin/notes/tree-sitter/starter-guide: Typos.
9ac242ce93d ; Fix recent changes in treesit docs
f5789aefc2e Rename LIMIT to DEPTH in tree-sitter functions (bug#61231)
b39821fdcef ; Fix incorrect function name in treesit manual
51901736965 Add 'live' property to treesit-node-check (bug#61235)
56960a6558b Update to Transient v0.3.7-205-gb8ad0da
68a6b364d1c Fix 'rmail-summary-output'
67c6ec25590 lisp-mode: add docstring recognition for more common lisp...
417a8ed8b05 ; Improve discoverability of empty file names handling
e47cf6ca15a Update to Transient v0.3.7-204-gecff8c2
b04cce02ff4 Fix Scala entry in Eglot's DB of LSP servers
# Conflicts:
# lisp/transient.el
Diffstat (limited to 'lisp/subr.el')
| -rw-r--r-- | lisp/subr.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/subr.el b/lisp/subr.el index f749c9e6d28..898ecb6e358 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -4182,8 +4182,8 @@ or byte-code." "Return the SHA-1 (Secure Hash Algorithm) of an OBJECT. 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. +computing the hash. If BINARY is non-nil, return a 40-byte unibyte +string; otherwise returna 40-character string. Note that SHA-1 is not collision resistant and should not be used for anything security-related. See `secure-hash' for |