From: Stefan Kangas <stefankangas@gmail.com>
Date: Sun, 12 Feb 2023 02:27:46 +0000 (+0100)
Subject: Merge from origin/emacs-29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=08bd066149faee95fe6660d5002306a1dbc4b91b;p=emacs.git

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
---

08bd066149faee95fe6660d5002306a1dbc4b91b
diff --cc lisp/image/exif.el
index 50428c3a31a,503e3ffadc7..4807df0fbbb
--- a/lisp/image/exif.el
+++ b/lisp/image/exif.el
@@@ -282,18 -284,20 +285,20 @@@ VALUE is little-endian, otherwise it i
      (otherwise value)))
  
  (defun exif--read-chunk (bytes)
-   "Return BYTES octets from the buffer and advance point that much."
+   "Return BYTES octets from the current buffer and advance point that much.
+ This function assumes that the current buffer is unibyte."
    (when (> (+ (point) bytes) (point-max))
 -    (signal 'exif-error "Premature end of file"))
 +    (signal 'exif-error '("Premature end of file")))
    (prog1
        (buffer-substring (point) (+ (point) bytes))
      (forward-char bytes)))
  
  (defun exif--read-number-be (bytes)
-   "Read BYTES octets from the buffer as a chunk of big-endian bytes.
- Advance point to after the read bytes."
+   "Read BYTES octets from the current buffer as a chunk of big-endian bytes.
+ Advance point to after the read bytes.
+ This function assumes that the current buffer is unibyte."
    (when (> (+ (point) bytes) (point-max))
 -    (signal 'exif-error "Premature end of file"))
 +    (signal 'exif-error '("Premature end of file")))
    (let ((sum 0))
      (dotimes (_ bytes)
        (setq sum (+ (* sum 256) (following-char)))
@@@ -301,10 -305,11 +306,11 @@@
      sum))
  
  (defun exif--read-number-le (bytes)
-   "Read BYTES octets from the buffer as a chunk of low-endian bytes.
- Advance point to after the read bytes."
+   "Read BYTES octets from the current buffer as a chunk of little-endian bytes.
+ Advance point to after the read bytes.
+ This function assumes that the current buffer is unibyte."
    (when (> (+ (point) bytes) (point-max))
 -    (signal 'exif-error "Premature end of file"))
 +    (signal 'exif-error '("Premature end of file")))
    (let ((sum 0))
      (dotimes (i bytes)
        (setq sum (+ (* (following-char) (expt 256 i)) sum))