Rename term_init to init_tty.

* src/term.c (term_init): Rename to init_tty.

* src/dispextern.h (term_init): Rename to init_tty.

* src/dispnew.c (init_display): Update.
* src/frame.c (Fmake_terminal_frame): Update.
* src/term.c (tty_setup_colors): Update comment.



git-archimport-id: [email protected]/emacs--multi-tty--0--patch-381

4 files changed, 7 insertions, 7 deletions

diff --git a/src/dispextern.h b/src/dispextern.h
index 9a1d484064..a6960c0354 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2933,7 +2933,7 @@ extern struct display *get_display P_ ((Lisp_Object display, int));
 extern struct display *get_named_tty_display P_ ((char *));
 EXFUN (Fdisplay_tty_type, 1);
 extern struct display *init_initial_display P_ ((void));
-extern struct display *term_init P_ ((char *, char *, int));
+extern struct display *init_tty P_ ((char *, char *, int));
 extern void delete_tty P_ ((struct display *));
 extern void fatal P_ ((/* char *, ... */));
 extern void cursor_to P_ ((struct frame *, int, int));
diff --git a/src/dispnew.c b/src/dispnew.c
index 4bae5a231a..1a71498bf3 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6727,7 +6727,7 @@ For types not defined in VMS, use  define emacs_term \"TYPE\".\n\
     struct frame *f = XFRAME (selected_frame);
 
     /* Open a display on the controlling tty. */
-    d = term_init (0, terminal_type, 1); /* Errors are fatal. */
+    d = init_tty (0, terminal_type, 1); /* Errors are fatal. */
 
     /* Convert the initial frame to use the new display. */
     if (f->output_method != output_initial)
diff --git a/src/frame.c b/src/frame.c
index 8ebcbc90b1..9f138390ac 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -736,7 +736,7 @@ affects all frames on the same terminal device.  */)
           type[SBYTES (tty_type)] = 0;
         }
 
-      d = term_init (name, type, 0); /* Errors are not fatal. */
+      d = init_tty (name, type, 0); /* Errors are not fatal. */
     }
 
   f = make_terminal_frame (d);
diff --git a/src/term.c b/src/term.c
index 2fae139e7f..94b848b520 100644
--- a/src/term.c
+++ b/src/term.c
@@ -2023,7 +2023,7 @@ tty_default_color_capabilities (struct tty_display_info *tty, int save)
 /* Setup one of the standard tty color schemes according to MODE.
    MODE's value is generally the number of colors which we want to
    support; zero means set up for the default capabilities, the ones
-   we saw at term_init time; -1 means turn off color support.  */
+   we saw at init_tty time; -1 means turn off color support.  */
 void
 tty_setup_colors (struct tty_display_info *tty, int mode)
 {
@@ -2358,7 +2358,7 @@ static void maybe_fatal();
    If MUST_SUCCEED is true, then all errors are fatal. */
 
 struct display *
-term_init (char *name, char *terminal_type, int must_succeed)
+init_tty (char *name, char *terminal_type, int must_succeed)
 {
   char *area;
   char **address = &area;
@@ -2376,7 +2376,7 @@ term_init (char *name, char *terminal_type, int must_succeed)
 
   /* If we already have an active display on the given device, use that.
      If all displays are suspended, create a new one instead.  */
-  /* XXX Perhaps this should be made explicit by having term_init
+  /* XXX Perhaps this should be made explicit by having init_tty
      always create a new display and separating display and frame
      creation on Lisp level.  */
   display = get_named_tty_display (name);
@@ -2931,7 +2931,7 @@ to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.",
 #endif /* not WINDOWSNT */
 }
 
-/* Auxiliary error-handling function for term_init.
+/* Auxiliary error-handling function for init_tty.
    Free BUFFER and delete DISPLAY, then call error or fatal
    with str1 or str2, respectively, according to MUST_SUCCEED.  */