diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 14 | ||||
| -rw-r--r-- | src/dispextern.h | 6 | ||||
| -rw-r--r-- | src/emacs.c | 2 | ||||
| -rw-r--r-- | src/w32.c | 1 |
4 files changed, 20 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 37e6d20eb83..f0ec092c068 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,17 @@ +2015-02-26 Eli Zaretskii <eliz@gnu.org> + + * dispextern.h (FACE_FOR_CHAR): Fix the commentary. + +2015-02-26 Hans Wennborg <hwennborg@google.com> (tiny change) + + * emacs.c (decode_env_path): Add parentheses around ternary + operator to increase readability and pacify compiler warnings. + +2015-02-26 Eli Zaretskii <eliz@gnu.org> + + * w32.c (sys_readdir): Map ERROR_NOT_READY (as in "device not + ready") to ENOENT. + 2015-02-26 Paul Eggert <eggert@cs.ucla.edu> * xfns.c (x_real_pos_and_offsets): Fix pointer signedness. diff --git a/src/dispextern.h b/src/dispextern.h index 5f730df514b..329572eda22 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -1810,8 +1810,10 @@ struct face_cache ((FACE) == (FACE)->ascii_face) /* Return the id of the realized face on frame F that is like the face - with id ID but is suitable for displaying character CHAR. - This macro is only meaningful for multibyte character CHAR. */ + FACE, but is suitable for displaying character CHAR at buffer or + string position POS. OBJECT is the string object, or nil for + buffer. This macro is only meaningful for multibyte character + CHAR. */ #define FACE_FOR_CHAR(F, FACE, CHAR, POS, OBJECT) \ face_for_char ((F), (FACE), (CHAR), (POS), (OBJECT)) diff --git a/src/emacs.c b/src/emacs.c index c2b698ba50b..cb0c8417794 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -2247,7 +2247,7 @@ decode_env_path (const char *evarname, const char *defalt, bool empty) p = strchr (path, SEPCHAR); if (!p) p = path + strlen (path); - element = (p - path ? make_unibyte_string (path, p - path) + element = ((p - path) ? make_unibyte_string (path, p - path) : empty_element); if (! NILP (element)) { diff --git a/src/w32.c b/src/w32.c index 90096689776..547db0f6dd9 100644 --- a/src/w32.c +++ b/src/w32.c @@ -3455,6 +3455,7 @@ sys_readdir (DIR *dirp) break; case ERROR_PATH_NOT_FOUND: case ERROR_INVALID_DRIVE: + case ERROR_NOT_READY: case ERROR_BAD_NETPATH: case ERROR_BAD_NET_NAME: errno = ENOENT; |