diff options
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/emacs.c b/src/emacs.c index eb1871841ec..87f12d3fa86 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -2444,6 +2444,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem #if !defined ANDROID_STUBIFY syms_of_androidfont (); syms_of_androidselect (); + syms_of_androidvfs (); syms_of_sfntfont (); syms_of_sfntfont_android (); #endif /* !ANDROID_STUBIFY */ @@ -2900,7 +2901,7 @@ sort_args (int argc, char **argv) new[to++] = argv[best + i + 1]; } - incoming_used += 1 + (options[best] > 0 ? options[best] : 0); + incoming_used += 1 + max (options[best], 0); /* Clear out this option in ARGV. */ argv[best] = 0; @@ -3116,10 +3117,6 @@ shut_down_emacs (int sig, Lisp_Object stuff) check_message_stack (); } -#ifdef HAVE_NATIVE_COMP - eln_load_path_final_clean_up (); -#endif - #ifdef MSDOS dos_cleanup (); #endif |