Merge from mainline.

1 files changed, 4 insertions, 19 deletions

diff --git a/src/editfns.c b/src/editfns.c
index e754a074ba8..5e1dcce0275 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -107,8 +107,8 @@ static Lisp_Object subst_char_in_region_unwind_1 (Lisp_Object);
 static void transpose_markers (EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT,
                                EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT);
 
-Lisp_Object Qbuffer_access_fontify_functions;
-Lisp_Object Fuser_full_name (Lisp_Object);
+static Lisp_Object Qbuffer_access_fontify_functions;
+static Lisp_Object Fuser_full_name (Lisp_Object);
 
 /* Symbol for the text property used to mark fields.  */
 
@@ -116,7 +116,7 @@ Lisp_Object Qfield;
 
 /* A special value for Qfield properties.  */
 
-Lisp_Object Qboundary;
+static Lisp_Object Qboundary;
 
 
 void
@@ -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)
@@ -3802,7 +3793,7 @@ usage: (format STRING &rest OBJECTS)  */)
             if (*format == 'c')
               {
                 if (! ASCII_CHAR_P (XINT (args[n]))
-                    /* Note: No one can remeber why we have to treat
+                    /* Note: No one can remember why we have to treat
                        the character 0 as a multibyte character here.
                        But, until it causes a real problem, let's
                        don't change it.  */
@@ -3816,12 +3807,6 @@ usage: (format STRING &rest OBJECTS)  */)
                     args[n] = Fchar_to_string (args[n]);
                     thissize = SBYTES (args[n]);
                   }
-                else if (! ASCII_BYTE_P (XINT (args[n])) && multibyte)
-                  {
-                    args[n]
-                      = Fchar_to_string (Funibyte_char_to_multibyte (args[n]));
-                    thissize = SBYTES (args[n]);
-                  }
               }
           }
         else if (FLOATP (args[n]) && *format != 's')