diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-09-25 16:15:16 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-09-25 16:15:16 -0400 |
| commit | 650c20f1ca4e07591a727e1cfcc74b3363d15985 (patch) | |
| tree | 85d11f6437cde22f410c25e0e5f71a3131ebd07d /lisp/hex-util.el | |
| parent | 8869332684c2302b5ba1ead4568bbc7ba1c0183e (diff) | |
| parent | 4b85ae6a24380fb67a3315eaec9233f17a872473 (diff) | |
| download | emacs-650c20f1ca4e07591a727e1cfcc74b3363d15985.tar.gz emacs-650c20f1ca4e07591a727e1cfcc74b3363d15985.tar.bz2 emacs-650c20f1ca4e07591a727e1cfcc74b3363d15985.zip | |
Merge 'master' into noverlay
Diffstat (limited to 'lisp/hex-util.el')
| -rw-r--r-- | lisp/hex-util.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/hex-util.el b/lisp/hex-util.el index 5289f06f4ea..101c8be7b48 100644 --- a/lisp/hex-util.el +++ b/lisp/hex-util.el @@ -1,6 +1,6 @@ ;;; hex-util.el --- Functions to encode/decode hexadecimal string -*- lexical-binding: t -*- -;; Copyright (C) 1999, 2001-2017 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2001-2022 Free Software Foundation, Inc. ;; Author: Shuhei KOBAYASHI <shuhei@aqua.ocn.ne.jp> ;; Keywords: data @@ -41,8 +41,8 @@ (dst (make-string (/ len 2) 0)) (idx 0)(pos 0)) (while (< pos len) - ;; logior and lsh are not byte-coded. - ;; (aset dst idx (logior (lsh (hex-char-to-num (aref string pos)) 4) + ;; logior and ash are not byte-coded. + ;; (aset dst idx (logior (ash (hex-char-to-num (aref string pos)) 4) ;; (hex-char-to-num (aref string (1+ pos))))) (aset dst idx (+ (* (hex-char-to-num (aref string pos)) 16) (hex-char-to-num (aref string (1+ pos))))) @@ -56,8 +56,8 @@ (dst (make-string (* len 2) 0)) (idx 0)(pos 0)) (while (< pos len) - ;; logand and lsh are not byte-coded. - ;; (aset dst idx (num-to-hex-char (logand (lsh (aref string pos) -4) 15))) + ;; logand and ash are not byte-coded. + ;; (aset dst idx (num-to-hex-char (logand (ash (aref string pos) -4) 15))) (aset dst idx (num-to-hex-char (/ (aref string pos) 16))) (setq idx (1+ idx)) ;; (aset dst idx (num-to-hex-char (logand (aref string pos) 15))) |