* editfns.c: Move a (normally-unused) function to its only use.

* editfns.c, lisp.h (get_operating_system_release): Remove.
* process.c (init_process) [DARWIN_OS]: Do it inline, as it is not
worth the hassle of breaking this out.

4 files changed, 8 insertions, 11 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 94712577e87..7b0a1de11da 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2011-04-13  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * editfns.c: Move a (normally-unused) function to its only use.
+        * editfns.c, lisp.h (get_operating_system_release): Remove.
+        * process.c (init_process) [DARWIN_OS]: Do it inline, as it is not
+        worth the hassle of breaking this out.
+
         * xterm.c: Make symbols static if they're not exported.
         (x_raise_frame, x_lower_frame, x_wm_set_window_state):
         (x_wm_set_icon_pixmap, x_initialize, XTread_socket_fake_io_error):
diff --git a/src/editfns.c b/src/editfns.c
index afb1e8ebc18..ce77d10cb2f 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1403,15 +1403,6 @@ get_system_name (void)
     return "";
 }
 
-const char *
-get_operating_system_release (void)
-{
-  if (STRINGP (Voperating_system_release))
-    return SSDATA (Voperating_system_release);
-  else
-    return "";
-}
-
 DEFUN ("emacs-pid", Femacs_pid, Semacs_pid, 0, 0, 0,
        doc: /* Return the process ID of Emacs, as an integer.  */)
   (void)
diff --git a/src/lisp.h b/src/lisp.h
index 7f4f06c5c5d..06075332b2d 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2925,7 +2925,6 @@ extern Lisp_Object make_buffer_string_both (EMACS_INT, EMACS_INT, EMACS_INT,
                                             EMACS_INT, int);
 extern void init_editfns (void);
 const char *get_system_name (void);
-const char *get_operating_system_release (void);
 extern void syms_of_editfns (void);
 EXFUN (Fconstrain_to_field, 5);
 EXFUN (Ffield_end, 3);
diff --git a/src/process.c b/src/process.c
index 89d04081eb7..51546e7c78a 100644
--- a/src/process.c
+++ b/src/process.c
@@ -7188,7 +7188,9 @@ init_process (void)
      processes.  As such, we only change the default value.  */
  if (initialized)
   {
-    const char *release = get_operating_system_release ();
+    char const *release = (STRINGP (Voperating_system_release)
+                           ? SSDATA (Voperating_system_release)
+                           : 0);
     if (!release || !release[0] || (release[0] < MIN_PTY_KERNEL_VERSION
                                     && release[1] == '.')) {
       Vprocess_connection_type = Qnil;