[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/x_emacs bf8fff0 3/3: fixup! Rename non-X x_* ident
From: |
Alexander Gramiak |
Subject: |
[Emacs-diffs] scratch/x_emacs bf8fff0 3/3: fixup! Rename non-X x_* identifiers |
Date: |
Wed, 17 Apr 2019 10:07:37 -0400 (EDT) |
branch: scratch/x_emacs
commit bf8fff033a91ae7e74ae019d193111995c8ef7c7
Author: Alexander Gramiak <address@hidden>
Commit: Alexander Gramiak <address@hidden>
fixup! Rename non-X x_* identifiers
---
src/nsimage.m | 2 +-
src/nsterm.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/nsimage.m b/src/nsimage.m
index f16910d..33236c4 100644
--- a/src/nsimage.m
+++ b/src/nsimage.m
@@ -193,7 +193,7 @@ ns_set_alpha (void *img, int x, int y, unsigned char a)
EmacsImage *image;
/* Search bitmap-file-path for the file, if appropriate. */
- found = x_find_image_file (file);
+ found = image_find_image_file (file);
if (!STRINGP (found))
return nil;
found = ENCODE_FILE (found);
diff --git a/src/nsterm.h b/src/nsterm.h
index fb683a6..683f2dd 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -1143,7 +1143,7 @@ ns_defined_color (struct frame *f,
XColor *color_def, bool alloc,
bool makeIndex);
extern void
-ns_query_color (void *col, XColor *color_def, int setPixel);
+ns_query_color (void *col, XColor *color_def, bool setPixel);
#ifdef __OBJC__
extern int ns_lisp_to_color (Lisp_Object color, NSColor **col);