diff options
author | Eli Zaretskii <eliz@gnu.org> | 2022-10-21 18:29:05 +0300 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2022-10-21 18:29:05 +0300 |
commit | 9bc1999b6f2d92e06a2c3d95dfde0b64ee1c6daf (patch) | |
tree | 7f49338c8f17decd469df33eff8a13930155d421 /lisp/emacs-lisp | |
parent | 4bb4b2a921ddc901802863005427fefbfa70807e (diff) | |
parent | 40a361fbd600cba00f97e853112534626f10c654 (diff) | |
download | emacs-9bc1999b6f2d92e06a2c3d95dfde0b64ee1c6daf.tar.gz emacs-9bc1999b6f2d92e06a2c3d95dfde0b64ee1c6daf.tar.bz2 emacs-9bc1999b6f2d92e06a2c3d95dfde0b64ee1c6daf.zip |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r-- | lisp/emacs-lisp/bindat.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/bindat.el b/lisp/emacs-lisp/bindat.el index 0ecac3d52aa..82d3c5309f8 100644 --- a/lisp/emacs-lisp/bindat.el +++ b/lisp/emacs-lisp/bindat.el @@ -163,7 +163,9 @@ (let ((s (substring bindat-raw bindat-idx (+ bindat-idx len)))) (setq bindat-idx (+ bindat-idx len)) (if (stringp s) s - (apply #'unibyte-string s)))) + ;; FIXME: There should be a more efficient way to do this. + ;; Should `apply' accept vectors in addition to lists? + (apply #'unibyte-string (append s nil))))) (defun bindat--unpack-strz (&optional len) (let ((i 0) s) @@ -172,7 +174,7 @@ (setq s (substring bindat-raw bindat-idx (+ bindat-idx i))) (setq bindat-idx (+ bindat-idx (or len (1+ i)))) (if (stringp s) s - (apply #'unibyte-string s)))) + (apply #'unibyte-string (append s nil))))) (defun bindat--unpack-bits (len) (let ((bits nil) (bnum (1- (* 8 len))) j m) |