diff options
| author | Alan Third <alan@idiocy.org> | 2021-06-08 20:08:34 +0100 |
|---|---|---|
| committer | Alan Third <alan@idiocy.org> | 2021-06-09 12:54:58 +0100 |
| commit | fb62846b68bd12f90dc16f1b0dd326546d41ec49 (patch) | |
| tree | 303fbe2bc41be7e2d351ec5cec6168bf3caf66b6 /src/nsfns.m | |
| parent | a63587c546144b349122a2ec126167c2c10fc4d5 (diff) | |
| download | emacs-fb62846b68bd12f90dc16f1b0dd326546d41ec49.tar.gz emacs-fb62846b68bd12f90dc16f1b0dd326546d41ec49.tar.bz2 emacs-fb62846b68bd12f90dc16f1b0dd326546d41ec49.zip | |
Fix image filename encoding issues (bug#48902)
* src/image.c (image_find_image_fd): Don't return an encoded filename
string.
* src/nsfns.m: ([NSString stringWithLispString:]): Clarify usage
comment.
* src/nsimage.m ([EmacsImage allocInitFromFile:]): No need to encode
the filename when converting to NSString.
Diffstat (limited to 'src/nsfns.m')
| -rw-r--r-- | src/nsfns.m | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nsfns.m b/src/nsfns.m index d14f7b51eaf..98801d8526f 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -3024,7 +3024,8 @@ all_nonzero_ascii (unsigned char *str, ptrdiff_t n) } @implementation NSString (EmacsString) -/* Make an NSString from a Lisp string. */ +/* Make an NSString from a Lisp string. STRING must not be in an + encoded form (e.g. UTF-8). */ + (NSString *)stringWithLispString:(Lisp_Object)string { /* Shortcut for the common case. */ |