[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 7471247 3/3: Replace use of obsolete string-make-un
From: |
Noam Postavsky |
Subject: |
[Emacs-diffs] master 7471247 3/3: Replace use of obsolete string-make-unibyte |
Date: |
Sun, 28 Apr 2019 16:46:25 -0400 (EDT) |
branch: master
commit 74712470fcb95cd4ef6ef5c61eee73cb8e02a8bd
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>
Replace use of obsolete string-make-unibyte
* lisp/image-file.el (insert-image-file): Use encode-coding-region
instead of string-make-unibyte.
* test/lisp/image-file-tests.el: New test.
---
lisp/image-file.el | 7 ++-----
test/lisp/image-file-tests.el | 44 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+), 5 deletions(-)
diff --git a/lisp/image-file.el b/lisp/image-file.el
index abc4686..6cadc42 100644
--- a/lisp/image-file.el
+++ b/lisp/image-file.el
@@ -110,11 +110,8 @@ absolute file name and number of characters inserted."
(let* ((ibeg (point))
(iend (+ (point) (cadr rval)))
(visitingp (and visit (= ibeg (point-min)) (= iend (point-max))))
- (data
- (string-make-unibyte
- (buffer-substring-no-properties ibeg iend)))
- (image
- (create-image data nil t))
+ (image (create-image (encode-coding-region ibeg iend 'binary t)
+ nil t))
(props
`(display ,image
yank-handler
diff --git a/test/lisp/image-file-tests.el b/test/lisp/image-file-tests.el
new file mode 100644
index 0000000..b3676d1
--- /dev/null
+++ b/test/lisp/image-file-tests.el
@@ -0,0 +1,44 @@
+;;; image-file-tests.el --- Test suite for image-files -*- lexical-binding:
t; -*-
+
+;; Copyright (C) 2019 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'ert)
+(require 'image-file)
+
+(defconst image-file-tests-data-directory
+ (expand-file-name "data/image" (getenv "EMACS_TEST_DIRECTORY"))
+ "Directory containing image test data.")
+
+(ert-deftest insert-image-file ()
+ (skip-unless (image-type-available-p 'png))
+ (with-temp-buffer
+ (set-buffer-multibyte t)
+ (insert-image-file (expand-file-name "blank-100x200.png"
+ image-file-tests-data-directory))
+ (should (image--get-image)))
+ (with-temp-buffer
+ (set-buffer-multibyte nil)
+ (insert-image-file (expand-file-name "blank-100x200.png"
+ image-file-tests-data-directory))
+ (should (image--get-image))))
+
+;;; image-file-tests.el ends here