diff options
| author | K. Handa | 2016-01-03 17:53:43 +0900 |
|---|---|---|
| committer | K. Handa | 2016-01-03 17:53:43 +0900 |
| commit | fb6d826c69939c2d016c1b824d4e9bcb53d9e643 (patch) | |
| tree | b9ce862d6cbe25e740203421984df21e4cbadbf4 /src/nsimage.m | |
| parent | 536f48e9a2251b9e654ea974bd90ff2f40218753 (diff) | |
| parent | 91917dd58ec5278e555b9c693a830749083e8f89 (diff) | |
| download | emacs-fb6d826c69939c2d016c1b824d4e9bcb53d9e643.tar.gz emacs-fb6d826c69939c2d016c1b824d4e9bcb53d9e643.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/nsimage.m')
| -rw-r--r-- | src/nsimage.m | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nsimage.m b/src/nsimage.m index bdaf6a46b83..fad2538a0cb 100644 --- a/src/nsimage.m +++ b/src/nsimage.m | |||
| @@ -66,7 +66,7 @@ ns_image_for_XPM (int width, int height, int depth) | |||
| 66 | void * | 66 | void * |
| 67 | ns_image_from_file (Lisp_Object file) | 67 | ns_image_from_file (Lisp_Object file) |
| 68 | { | 68 | { |
| 69 | NSTRACE ("ns_image_from_bitmap_file"); | 69 | NSTRACE ("ns_image_from_file"); |
| 70 | return [EmacsImage allocInitFromFile: file]; | 70 | return [EmacsImage allocInitFromFile: file]; |
| 71 | } | 71 | } |
| 72 | 72 | ||