Commit e946a9ac authored by Dmitry Antipov's avatar Dmitry Antipov
Browse files

Miscellaneous tiny fixes here and there.

* fileio.c (Ffile_name_as_directory, Fdirectory_file_name):
Remove dead NILP check.
* image.c (Flookup_image): Use regular format for docstring.
* keyboard.c (apply_modifiers_uncached): Use stpcpy.
parent fb35f1f7
2015-01-12 Dmitry Antipov <dmantipov@yandex.ru>
* fileio.c (Ffile_name_as_directory, Fdirectory_file_name):
Remove dead NILP check.
* image.c (Flookup_image): Use regular format for docstring.
* keyboard.c (apply_modifiers_uncached): Use stpcpy.
2015-01-12 Martin Rudalics <rudalics@gmx.at> 2015-01-12 Martin Rudalics <rudalics@gmx.at>
   
* dispnew.c (change_frame_size_1): Pass Qchange_frame_size to * dispnew.c (change_frame_size_1): Pass Qchange_frame_size to
......
...@@ -522,8 +522,6 @@ For a Unix-syntax file name, just appends a slash. */) ...@@ -522,8 +522,6 @@ For a Unix-syntax file name, just appends a slash. */)
USE_SAFE_ALLOCA; USE_SAFE_ALLOCA;
CHECK_STRING (file); CHECK_STRING (file);
if (NILP (file))
return Qnil;
/* If the file name has special constructs in it, /* If the file name has special constructs in it,
call the corresponding file handler. */ call the corresponding file handler. */
...@@ -591,9 +589,6 @@ In Unix-syntax, this function just removes the final slash. */) ...@@ -591,9 +589,6 @@ In Unix-syntax, this function just removes the final slash. */)
CHECK_STRING (directory); CHECK_STRING (directory);
if (NILP (directory))
return Qnil;
/* If the file name has special constructs in it, /* If the file name has special constructs in it,
call the corresponding file handler. */ call the corresponding file handler. */
handler = Ffind_file_name_handler (directory, Qdirectory_file_name); handler = Ffind_file_name_handler (directory, Qdirectory_file_name);
......
...@@ -9288,7 +9288,8 @@ DEFUN ("imagep", Fimagep, Simagep, 1, 1, 0, ...@@ -9288,7 +9288,8 @@ DEFUN ("imagep", Fimagep, Simagep, 1, 1, 0,
} }
DEFUN ("lookup-image", Flookup_image, Slookup_image, 1, 1, 0, "") DEFUN ("lookup-image", Flookup_image, Slookup_image, 1, 1, 0,
doc: /* */)
(Lisp_Object spec) (Lisp_Object spec)
{ {
ptrdiff_t id = -1; ptrdiff_t id = -1;
......
...@@ -6270,10 +6270,10 @@ apply_modifiers_uncached (int modifiers, char *base, int base_len, int base_len_ ...@@ -6270,10 +6270,10 @@ apply_modifiers_uncached (int modifiers, char *base, int base_len, int base_len_
if (modifiers & meta_modifier) { *p++ = 'M'; *p++ = '-'; } if (modifiers & meta_modifier) { *p++ = 'M'; *p++ = '-'; }
if (modifiers & shift_modifier) { *p++ = 'S'; *p++ = '-'; } if (modifiers & shift_modifier) { *p++ = 'S'; *p++ = '-'; }
if (modifiers & super_modifier) { *p++ = 's'; *p++ = '-'; } if (modifiers & super_modifier) { *p++ = 's'; *p++ = '-'; }
if (modifiers & double_modifier) { strcpy (p, "double-"); p += 7; } if (modifiers & double_modifier) p = stpcpy (p, "double-");
if (modifiers & triple_modifier) { strcpy (p, "triple-"); p += 7; } if (modifiers & triple_modifier) p = stpcpy (p, "triple-");
if (modifiers & down_modifier) { strcpy (p, "down-"); p += 5; } if (modifiers & down_modifier) p = stpcpy (p, "down-");
if (modifiers & drag_modifier) { strcpy (p, "drag-"); p += 5; } if (modifiers & drag_modifier) p = stpcpy (p, "drag-");
/* The click modifier is denoted by the absence of other modifiers. */ /* The click modifier is denoted by the absence of other modifiers. */
*p = '\0'; *p = '\0';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment