; Last-minute updates to Android port

* lisp/electric.el:
* lisp/help-macro.el (make-help-screen):
* lisp/subr.el (read-char-choice-with-read-key):
* src/buffer.c (init_buffer_once):
* src/dispextern.h (No_Cursor):
* src/keyboard.c (read_char):
* src/process.c (Fprocess_send_eof): Fix commentary or unnecessary
whitespace changes.

diff --git a/lisp/electric.el b/lisp/electric.el
index 8b379ed16e200b66607c1a411da38b0485833fd4..cef5326852ce340794a35d08e42c8083ac2ec21c 100644 (file)
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -294,7 +294,6 @@ or comment."
 
 ;;;###autoload
 (define-key global-map "\C-j" 'electric-newline-and-maybe-indent)
-
 ;;;###autoload
 (defun electric-newline-and-maybe-indent ()
   "Insert a newline.

diff --git a/lisp/help-macro.el b/lisp/help-macro.el
index 0905d1946f3f7ebca9513c5ce69741cd03150522..fac3419f1849fa2f1bf91ca72de5997adabd8bda 100644 (file)
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -166,7 +166,7 @@ and then returns."
                      (error nil))
                    (let ((cursor-in-echo-area t)
                          (overriding-local-map local-map))
-                     (frame-toggle-on-screen-keyboard nil nil)
+                     (frame-toggle-on-screen-keyboard (selected-frame) nil)
                      (setq key (read-key-sequence
                                 (format "Type one of listed options%s: "
                                         (if (pos-visible-in-window-p

diff --git a/lisp/subr.el b/lisp/subr.el
index 89278241777919909a089d64c94637f3be82821c..3e4808c54716d48ac827af57faf3dce9d146612c 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3348,7 +3348,7 @@ causes it to evaluate `help-form' and display the result."
          (unless (get-text-property 0 'face prompt)
            (setq prompt (propertize prompt 'face 'minibuffer-prompt)))
           ;; Display the on screen keyboard if it exists.
-          (frame-toggle-on-screen-keyboard nil t)
+          (frame-toggle-on-screen-keyboard (selected-frame) nil)
          (setq char (let ((inhibit-quit inhibit-keyboard-quit))
                       (read-key prompt)))
          (and show-help (buffer-live-p (get-buffer helpbuf))

diff --git a/src/buffer.c b/src/buffer.c
index 9bcace37e9ba4b3b6bdce0f384d15ace77952afd..9facc4b7ab8fea48d7152d0aadc03e7713f14d44 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -4791,9 +4791,7 @@ init_buffer_once (void)
 #ifdef HAVE_TREE_SITTER
   bset_ts_parser_list (&buffer_defaults, Qnil);
 #endif
-#ifdef HAVE_TEXT_CONVERSION
   bset_text_conversion_style (&buffer_defaults, Qnil);
-#endif
   bset_cursor_in_non_selected_windows (&buffer_defaults, Qt);
 
   bset_enable_multibyte_characters (&buffer_defaults, Qt);

diff --git a/src/dispextern.h b/src/dispextern.h
index cf67121809f497aefcc022d91686b2caa9ee2415..3a4d6095f734a3b4aecd6dc33fbb770f3fab3990 100644 (file)
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -57,7 +57,6 @@ typedef struct
 /* Accommodate X's usage of None as a null resource ID.  */
 #define No_Cursor (NULL)
 #else
-/* Android doesn't support cursors and also uses handles.  */
 #define No_Cursor 0
 #endif
 

diff --git a/src/keyboard.c b/src/keyboard.c
index 445f39ea1402a2c298b783666fb77d085451810b..78c88a2859b3f96c51c7efb197484e00f2188e96 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3053,9 +3053,6 @@ read_char (int commandflag, Lisp_Object map,
       struct buffer *prev_buffer = current_buffer;
       last_input_event = c;
 
-      /* All a `text-conversion' event does is prevent Emacs from
-        staying idle.  It is not useful.  */
-
       call4 (Qcommand_execute, tem, Qnil, Fvector (1, &last_input_event), Qt);
 
       if (CONSP (c) && !NILP (Fmemq (XCAR (c), Vwhile_no_input_ignore_events))

diff --git a/src/process.c b/src/process.c
index 90885ad318a38628c6e30358cc439cca73852805..7738f1e4bcc886d1017ef513eb4bd32cbee72c60 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -7252,7 +7252,7 @@ process has been transmitted to the serial port.  */)
 #if !defined WINDOWSNT && defined HAVE_TCDRAIN
       if (tcdrain (XPROCESS (proc)->outfd) != 0)
        report_file_error ("Failed tcdrain", Qnil);
-#endif /* not WINDOWSNT */
+#endif /* not WINDOWSNT && not TCDRAIN */
       /* Do nothing on Windows because writes are blocking.  */
     }
   else