auto upstream

10 files changed, 114 insertions, 115 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index af03fa54291..c54d4bee7e9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,59 @@
+2013-03-06  Eli Zaretskii  <eliz@gnu.org>
+
+        * search.c (find_newline_no_quit): Rename from find_next_newline.
+        Add commentary.
+
+        * lisp.h (find_newline_no_quit): Rename prototype.
+
+        * xdisp.c (back_to_previous_line_start)
+        (forward_to_next_line_start, get_visually_first_element)
+        (move_it_vertically_backward): Callers of find_newline_no_quit changed.
+        * indent.c (vmotion): Callers of find_newline_no_quit changed.
+        * bidi.c (bidi_find_paragraph_start): Callers of
+        find_newline_no_quit changed.
+
+        * msdos.c: Change encoding to cp850.  (Bug#13879)
+        (fr_keyboard, it_keyboard, dk_keyboard): Update keyboard layouts.
+
+2013-03-06  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        Coding system support cleanup and minor refactoring.
+        * coding.h (enum coding_result_code): Remove
+        CODING_RESULT_INCONSISTENT_EOL and CODING_RESULT_INSUFFICIENT_MEM.
+        (toplevel): Remove unused CODING_MODE_INHIBIT_INCONSISTENT_EOL.
+        (CODING_MODE_LAST_BLOCK, CODING_MODE_SELECTIVE_DISPLAY)
+        (CODING_MODE_DIRECTION, CODING_MODE_FIXED_DESTINATION)
+        (CODING_MODE_SAFE_ENCODING): Rearrange bit values.
+        (decode_coding_region, encode_coding_region, decode_coding_string):
+        Remove unused compatibility macros.
+        * coding.c (Qinconsistent_eol, Qinsufficient_memory): Remove.
+        (record_conversion_result): Adjust user.
+        (syms_of_coding): Likewise.
+        (ALLOC_CONVERSION_WORK_AREA): Use SAFE_ALLOCA.
+        (decode_coding, encode_coding): Add USE_SAFE_ALLOCA and SAFE_FREE.
+        (decode_coding_object): Simplify since xrealloc never returns NULL.
+        Add eassert.
+
+2013-03-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix a build failure on OpenBSD 4.x and MirBSD (Bug#13881).
+        * sysdep.c (list_system_processes)
+        [BSD_SYSTEM && !DARWIN_OS && !__FreeBSD__]:
+        Make it a stub in this case; otherwise the build might fail,
+        and this code hasn't been tested on such hosts anyway.
+        Problem reported by Nelson H. F. Beebe in
+        <http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00021.html>
+        and analyzed by Jérémie Courrèges-Anglas in
+        <http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00062.html>.
+
+2013-03-06  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * lisp.h (find_next_newline_no_quit): Rename to find_next_newline.
+        * xdisp.c (back_to_previous_line_start, forward_to_next_line_start)
+        (get_visually_first_element, move_it_vertically_backward): Ajust users.
+        * bidi.c (bidi_find_paragraph_start): Likewise.
+        * indent.c (vmotion): Likewise.
+
 2013-03-05  Paul Eggert  <eggert@cs.ucla.edu>
 
         FILE's lock is now always .#FILE and may be a regular file (Bug#13807).
@@ -57,16 +113,6 @@
         to be in sync with bidi_it->bytepos.  Suggested by Dmitry Antipov
         <dmantipov@yandex.ru>.
 
-2013-03-05  Paul Eggert  <eggert@cs.ucla.edu>
-
-        Fix a build failure on OpenBSD 4.x and MirBSD.
-        * sysdep.c (KERN_PROC, kinfo_proc)
-        [BSD_SYSTEM && (!KERN_PROC || __MirBSD__)]:
-        Define to KERN_PROC2 and kinfo_proc2, for OpenBSD 4.9 and MirBSD.
-        list-system-processes still returns nil, but at least it doesn't crash.
-        Problem reported by Nelson H. F. Beebe in
-        <http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00021.html>.
-
 2013-03-05  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * composite.c (get_composition_id, fill_gstring_header):
diff --git a/src/bidi.c b/src/bidi.c
index 57d154bc544..cf5e580cd8f 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -1108,7 +1108,7 @@ bidi_find_paragraph_start (ptrdiff_t pos, ptrdiff_t pos_byte)
        display string?  And what if a display string covering some
        of the text over which we scan back includes
        paragraph_start_re?  */
-    pos = find_next_newline_no_quit (pos - 1, -1, &pos_byte);
+    pos = find_newline_no_quit (pos - 1, -1, &pos_byte);
   if (n >= MAX_PARAGRAPH_SEARCH)
     pos_byte = BEGV_BYTE;
   return pos_byte;
diff --git a/src/coding.c b/src/coding.c
index 868fb7df0ea..32da72ab626 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -322,8 +322,7 @@ Lisp_Object Qcall_process, Qcall_process_region;
 Lisp_Object Qstart_process, Qopen_network_stream;
 static Lisp_Object Qtarget_idx;
 
-static Lisp_Object Qinsufficient_source, Qinconsistent_eol, Qinvalid_source;
-static Lisp_Object Qinterrupted, Qinsufficient_memory;
+static Lisp_Object Qinsufficient_source, Qinvalid_source, Qinterrupted;
 
 /* If a symbol has this property, evaluate the value to define the
    symbol as a coding system.  */
@@ -820,18 +819,12 @@ record_conversion_result (struct coding_system *coding,
     case CODING_RESULT_INSUFFICIENT_SRC:
       Vlast_code_conversion_error = Qinsufficient_source;
       break;
-    case CODING_RESULT_INCONSISTENT_EOL:
-      Vlast_code_conversion_error = Qinconsistent_eol;
-      break;
     case CODING_RESULT_INVALID_SRC:
       Vlast_code_conversion_error = Qinvalid_source;
       break;
     case CODING_RESULT_INTERRUPT:
       Vlast_code_conversion_error = Qinterrupted;
       break;
-    case CODING_RESULT_INSUFFICIENT_MEM:
-      Vlast_code_conversion_error = Qinsufficient_memory;
-      break;
     case CODING_RESULT_INSUFFICIENT_DST:
       /* Don't record this error in Vlast_code_conversion_error
          because it happens just temporarily and is resolved when the
@@ -6884,22 +6877,8 @@ produce_charset (struct coding_system *coding, int *charbuf, ptrdiff_t pos)
 
 #define ALLOC_CONVERSION_WORK_AREA(coding)                              \
   do {                                                                  \
-    int size = CHARBUF_SIZE;                                            \
-                                                                        \
-    coding->charbuf = NULL;                                             \
-    while (size > 1024)                                                 \
-      {                                                                 \
-        coding->charbuf = alloca (sizeof (int) * size);                 \
-        if (coding->charbuf)                                            \
-          break;                                                        \
-        size >>= 1;                                                     \
-      }                                                                 \
-    if (! coding->charbuf)                                              \
-      {                                                                 \
-        record_conversion_result (coding, CODING_RESULT_INSUFFICIENT_MEM); \
-        return;                                                         \
-      }                                                                 \
-    coding->charbuf_size = size;                                        \
+    coding->charbuf = SAFE_ALLOCA (CHARBUF_SIZE * sizeof (int));        \
+    coding->charbuf_size = CHARBUF_SIZE;                                \
   } while (0)
 
 
@@ -6968,6 +6947,8 @@ decode_coding (struct coding_system *coding)
   int carryover;
   int i;
 
+  USE_SAFE_ALLOCA;
+
   if (BUFFERP (coding->src_object)
       && coding->src_pos > 0
       && coding->src_pos < GPT
@@ -7090,6 +7071,8 @@ decode_coding (struct coding_system *coding)
       bset_undo_list (current_buffer, undo_list);
       record_insert (coding->dst_pos, coding->produced_char);
     }
+
+  SAFE_FREE ();
 }
 
 
@@ -7373,6 +7356,8 @@ encode_coding (struct coding_system *coding)
   int max_lookup;
   struct ccl_spec cclspec;
 
+  USE_SAFE_ALLOCA;
+
   attrs = CODING_ID_ATTRS (coding->id);
   if (coding->encoder == encode_coding_raw_text)
     translation_table = Qnil, max_lookup = 0;
@@ -7407,6 +7392,8 @@ encode_coding (struct coding_system *coding)
 
   if (BUFFERP (coding->dst_object) && coding->produced_char > 0)
     insert_from_gap (coding->produced_char, coding->produced);
+
+  SAFE_FREE ();
 }
 
 
@@ -7695,14 +7682,8 @@ decode_coding_object (struct coding_system *coding,
       set_buffer_internal (XBUFFER (coding->dst_object));
       if (dst_bytes < coding->produced)
         {
+          eassert (coding->produced > 0);
           destination = xrealloc (destination, coding->produced);
-          if (! destination)
-            {
-              record_conversion_result (coding,
-                                        CODING_RESULT_INSUFFICIENT_MEM);
-              unbind_to (count, Qnil);
-              return;
-            }
           if (BEGV < GPT && GPT < BEGV + coding->produced_char)
             move_gap_both (BEGV, BEGV_BYTE);
           memcpy (destination, BEGV_ADDR, coding->produced);
@@ -10408,10 +10389,8 @@ syms_of_coding (void)
         intern_c_string ("coding-category-undecided"));
 
   DEFSYM (Qinsufficient_source, "insufficient-source");
-  DEFSYM (Qinconsistent_eol, "inconsistent-eol");
   DEFSYM (Qinvalid_source, "invalid-source");
   DEFSYM (Qinterrupted, "interrupted");
-  DEFSYM (Qinsufficient_memory, "insufficient-memory");
   DEFSYM (Qcoding_system_define_form, "coding-system-define-form");
 
   defsubr (&Scoding_system_p);
diff --git a/src/coding.h b/src/coding.h
index eb95fa13ddb..28a7d776b63 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -272,37 +272,31 @@ enum coding_result_code
     CODING_RESULT_SUCCESS,
     CODING_RESULT_INSUFFICIENT_SRC,
     CODING_RESULT_INSUFFICIENT_DST,
-    CODING_RESULT_INCONSISTENT_EOL,
     CODING_RESULT_INVALID_SRC,
-    CODING_RESULT_INTERRUPT,
-    CODING_RESULT_INSUFFICIENT_MEM
+    CODING_RESULT_INTERRUPT
   };
 
 
 /* Macros used for the member `mode' of the struct coding_system.  */
 
-/* If set, recover the original CR or LF of the already decoded text
-   when the decoding routine encounters an inconsistent eol format.  */
-#define CODING_MODE_INHIBIT_INCONSISTENT_EOL    0x01
-
 /* If set, the decoding/encoding routines treat the current data as
    the last block of the whole text to be converted, and do the
    appropriate finishing job.  */
-#define CODING_MODE_LAST_BLOCK                  0x02
+#define CODING_MODE_LAST_BLOCK                  0x01
 
 /* If set, it means that the current source text is in a buffer which
    enables selective display.  */
-#define CODING_MODE_SELECTIVE_DISPLAY           0x04
+#define CODING_MODE_SELECTIVE_DISPLAY           0x02
 
 /* This flag is used by the decoding/encoding routines on the fly.  If
    set, it means that right-to-left text is being processed.  */
-#define CODING_MODE_DIRECTION                   0x08
+#define CODING_MODE_DIRECTION                   0x04
 
-#define CODING_MODE_FIXED_DESTINATION           0x10
+#define CODING_MODE_FIXED_DESTINATION           0x08
 
 /* If set, it means that the encoding routines produces some safe
    ASCII characters (usually '?') for unsupported characters.  */
-#define CODING_MODE_SAFE_ENCODING               0x20
+#define CODING_MODE_SAFE_ENCODING               0x10
 
   /* For handling composition sequence.  */
 #include "composite.h"
@@ -725,22 +719,6 @@ extern Lisp_Object from_unicode (Lisp_Object str);
 
 /* Macros for backward compatibility.  */
 
-#define decode_coding_region(coding, from, to)          \
-  decode_coding_object (coding, Fcurrent_buffer (),     \
-                        from, CHAR_TO_BYTE (from),      \
-                        to, CHAR_TO_BYTE (to), Fcurrent_buffer ())
-
-
-#define encode_coding_region(coding, from, to)          \
-  encode_coding_object (coding, Fcurrent_buffer (),     \
-                        from, CHAR_TO_BYTE (from),      \
-                        to, CHAR_TO_BYTE (to), Fcurrent_buffer ())
-
-
-#define decode_coding_string(coding, string, nocopy)                    \
-  decode_coding_object (coding, string, 0, 0, SCHARS (string),          \
-                        SBYTES (string), Qt)
-
 #define encode_coding_string(coding, string, nocopy)                    \
   (STRING_MULTIBYTE(string) ?                                           \
     (encode_coding_object (coding, string, 0, 0, SCHARS (string),       \
diff --git a/src/indent.c b/src/indent.c
index 9bf75bc6d95..abb4e08ad08 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -1843,7 +1843,7 @@ vmotion (register ptrdiff_t from, register EMACS_INT vtarget, struct window *w)
           ptrdiff_t bytepos;
           Lisp_Object propval;
 
-          prevline = find_next_newline_no_quit (from - 1, -1, &bytepos);
+          prevline = find_newline_no_quit (from - 1, -1, &bytepos);
           while (prevline > BEGV
                  && ((selective > 0
                       && indented_beyond_p (prevline, bytepos, selective))
@@ -1853,7 +1853,7 @@ vmotion (register ptrdiff_t from, register EMACS_INT vtarget, struct window *w)
                                                        Qinvisible,
                                                        text_prop_object),
                          TEXT_PROP_MEANS_INVISIBLE (propval))))
-            prevline = find_next_newline_no_quit (prevline - 1, -1, &bytepos);
+            prevline = find_newline_no_quit (prevline - 1, -1, &bytepos);
           pos = *compute_motion (prevline, 0,
                                  lmargin,
                                  0,
@@ -1894,7 +1894,7 @@ vmotion (register ptrdiff_t from, register EMACS_INT vtarget, struct window *w)
       ptrdiff_t bytepos;
       Lisp_Object propval;
 
-      prevline = find_next_newline_no_quit (from, -1, &bytepos);
+      prevline = find_newline_no_quit (from, -1, &bytepos);
       while (prevline > BEGV
              && ((selective > 0
                   && indented_beyond_p (prevline, bytepos, selective))
@@ -1904,7 +1904,7 @@ vmotion (register ptrdiff_t from, register EMACS_INT vtarget, struct window *w)
                                                    Qinvisible,
                                                    text_prop_object),
                      TEXT_PROP_MEANS_INVISIBLE (propval))))
-        prevline = find_next_newline_no_quit (prevline - 1, -1, &bytepos);
+        prevline = find_newline_no_quit (prevline - 1, -1, &bytepos);
       pos = *compute_motion (prevline, 0,
                              lmargin,
                              0,
diff --git a/src/lisp.h b/src/lisp.h
index f978a3b2fe0..46c1937c862 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3351,8 +3351,7 @@ extern ptrdiff_t find_newline (ptrdiff_t, ptrdiff_t, ptrdiff_t,
                                ptrdiff_t *, ptrdiff_t *, bool);
 extern EMACS_INT scan_newline (ptrdiff_t, ptrdiff_t, ptrdiff_t, ptrdiff_t,
                                EMACS_INT, bool);
-extern ptrdiff_t find_next_newline (ptrdiff_t, int);
-extern ptrdiff_t find_next_newline_no_quit (ptrdiff_t, ptrdiff_t, ptrdiff_t *);
+extern ptrdiff_t find_newline_no_quit (ptrdiff_t, ptrdiff_t, ptrdiff_t *);
 extern ptrdiff_t find_before_next_newline (ptrdiff_t, ptrdiff_t,
                                            ptrdiff_t, ptrdiff_t *);
 extern void syms_of_search (void);
diff --git a/src/msdos.c b/src/msdos.c
index ac8c90455d7..ee47109d5f2 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -1,4 +1,4 @@
-/* MS-DOS specific C utilities.          -*- coding: raw-text -*-
+/* MS-DOS specific C utilities.          -*- coding: cp850 -*-
 
 Copyright (C) 1993-1997, 1999-2013 Free Software Foundation, Inc.
 
@@ -20,6 +20,13 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Contributed by Morten Welinder */
 /* New display, keyboard, and mouse control by Kim F. Storm */
 
+/* Note: This file MUST use a unibyte encoding, to both display the
+   keys on the non-US keyboard layout as their respective labels, and
+   provide the correct byte values for the keyboard input to inject
+   into Emacs.  See 'struct dos_keyboard_map' below.  As long as there
+   are only European keyboard layouts here, we are OK with DOS
+   codepage 850 encoding.  */
+
 /* Note: some of the stuff here was taken from end of sysdep.c in demacs. */
 
 #include <config.h>
@@ -1965,10 +1972,10 @@ struct dos_keyboard_map
 
 static struct dos_keyboard_map us_keyboard = {
 /* 0         1         2         3         4         5      */
-/* 01234567890123456789012345678901234567890 12345678901234 */
-  "`1234567890-=  qwertyuiop[]   asdfghjkl;'\\   zxcvbnm,./  ",
+/* 01234567890123456789012345678901234567890 123 45678901234 */
+  "`1234567890-=  qwertyuiop[]   asdfghjkl;'\\  \\zxcvbnm,./  ",
 /* 0123456789012345678901234567890123456789 012345678901234 */
-  "~!@#$%^&*()_+  QWERTYUIOP{}   ASDFGHJKL:\"|   ZXCVBNM<>?  ",
+  "~!@#$%^&*()_+  QWERTYUIOP{}   ASDFGHJKL:\"|  |ZXCVBNM<>?  ",
   0,                            /* no Alt-Gr key */
   0                             /* no translate table */
 };
@@ -1976,9 +1983,9 @@ static struct dos_keyboard_map us_keyboard = {
 static struct dos_keyboard_map fr_keyboard = {
 /* 0         1         2         3         4         5      */
 /* 012 3456789012345678901234567890123456789012345678901234 */
-  "�&�\",(-�_��)=  azertyuiop^$   qsdfghjklm�*   wxcvbnm;:!  ",
+  "�&�\"'(-�_��)=  azertyuiop^$   qsdfghjklm�*  <wxcvbn,;:!  ",
 /* 0123456789012345678901234567890123456789012345678901234 */
-  " 1234567890�+  AZERTYUIOP��   QSDFGHJKLM%�   WXCVBN?./�  ",
+  " 1234567890�+  AZERTYUIOP��   QSDFGHJKLM%�  >WXCVBN?./�  ",
 /* 01234567 89012345678901234567890123456789012345678901234 */
   "  ~#{[|`\\^@]}             �                              ",
   0                             /* no translate table */
@@ -2000,9 +2007,9 @@ static struct kbd_translate it_kbd_translate_table[] = {
 static struct dos_keyboard_map it_keyboard = {
 /* 0          1         2         3         4         5     */
 /* 0 123456789012345678901234567890123456789012345678901234 */
-  "\\1234567890'�< qwertyuiop�+>  asdfghjkl���   zxcvbnm,.-  ",
+  "\\1234567890'�< qwertyuiop�+>  asdfghjkl���  <zxcvbnm,.-  ",
 /* 01 23456789012345678901234567890123456789012345678901234 */
-  "|!\"�$%&/()=?^> QWERTYUIOP�*   ASDFGHJKL���   ZXCVBNM;:_  ",
+  "|!\"�$%&/()=?^> QWERTYUIOP�*   ASDFGHJKL���  >ZXCVBNM;:_  ",
 /* 0123456789012345678901234567890123456789012345678901234 */
   "        {}~`             []             @#               ",
   it_kbd_translate_table
@@ -2011,9 +2018,9 @@ static struct dos_keyboard_map it_keyboard = {
 static struct dos_keyboard_map dk_keyboard = {
 /* 0         1         2         3         4         5      */
 /* 0123456789012345678901234567890123456789012345678901234 */
-  "�1234567890+|  qwertyuiop�~   asdfghjkl��'   zxcvbnm,.-  ",
+  "�1234567890+|  qwertyuiop�~   asdfghjkl��'  <zxcvbnm,.-  ",
 /* 01 23456789012345678901234567890123456789012345678901234 */
-  "�!\"#$%&/()=?`  QWERTYUIOP�^   ASDFGHJKL��*   ZXCVBNM;:_  ",
+  "�!\"#$%&/()=?`  QWERTYUIOP�^   ASDFGHJKL��*  >ZXCVBNM;:_  ",
 /* 0123456789012345678901234567890123456789012345678901234 */
   "  @�$  {[]} |                                             ",
   0                             /* no translate table */
diff --git a/src/search.c b/src/search.c
index 1c0f57487f9..090965ead3b 100644
--- a/src/search.c
+++ b/src/search.c
@@ -941,15 +941,17 @@ scan_newline (ptrdiff_t start, ptrdiff_t start_byte,
   return count * direction;
 }
 
+/* Like find_newline, but doesn't allow QUITting and doesn't return
+   SHORTAGE.  */
 ptrdiff_t
-find_next_newline_no_quit (ptrdiff_t from, ptrdiff_t cnt, ptrdiff_t *bytepos)
+find_newline_no_quit (ptrdiff_t from, ptrdiff_t cnt, ptrdiff_t *bytepos)
 {
   return find_newline (from, 0, cnt, NULL, bytepos, 0);
 }
 
-/* Like find_next_newline, but returns position before the newline,
-   not after, and only search up to TO.  This isn't just
-   find_next_newline (...)-1, because you might hit TO.  */
+/* Like find_newline, but returns position before the newline, not
+   after, and only search up to TO.
+   This isn't just find_newline_no_quit (...)-1, because you might hit TO.  */
 
 ptrdiff_t
 find_before_next_newline (ptrdiff_t from, ptrdiff_t to,
diff --git a/src/sysdep.c b/src/sysdep.c
index c4b937183ca..fe6371623a9 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -2541,20 +2541,12 @@ list_system_processes (void)
   return proclist;
 }
 
-#elif defined BSD_SYSTEM
-
-/* OpenBSD 4.9 and earlier do not have KERN_PROC.  Approximate it with
-   KERN_PROC2.  MirBSD's KERN_PROC seems to be busted.  */
-# if !defined KERN_PROC || defined __MirBSD__
-#  undef KERN_PROC
-#  define KERN_PROC KERN_PROC2
-#  define kinfo_proc kinfo_proc2
-# endif
+#elif defined DARWIN_OS || defined __FreeBSD__
 
 Lisp_Object
 list_system_processes (void)
 {
-#if defined DARWIN_OS || defined __NetBSD__ || defined __OpenBSD__
+#ifdef DARWIN_OS
   int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_ALL};
 #else
   int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PROC};
@@ -2580,10 +2572,8 @@ list_system_processes (void)
   len /= sizeof (struct kinfo_proc);
   for (i = 0; i < len; i++)
     {
-#if defined DARWIN_OS || defined __NetBSD__
+#ifdef DARWIN_OS
       proclist = Fcons (make_fixnum_or_float (procs[i].kp_proc.p_pid), proclist);
-#elif defined __OpenBSD__
-      proclist = Fcons (make_fixnum_or_float (procs[i].p_pid), proclist);
 #else
       proclist = Fcons (make_fixnum_or_float (procs[i].ki_pid), proclist);
 #endif
diff --git a/src/xdisp.c b/src/xdisp.c
index 83e3a06d21d..28acbbdb8c0 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5940,9 +5940,8 @@ pop_it (struct it *it)
 static void
 back_to_previous_line_start (struct it *it)
 {
-  IT_CHARPOS (*it)
-    = find_next_newline_no_quit (IT_CHARPOS (*it) - 1,
-                                 -1, &IT_BYTEPOS (*it));
+  IT_CHARPOS (*it) = find_newline_no_quit (IT_CHARPOS (*it) - 1, -1,
+                                           &IT_BYTEPOS (*it));
 }
 
 
@@ -5958,7 +5957,7 @@ back_to_previous_line_start (struct it *it)
 
    Newlines may come from buffer text, overlay strings, or strings
    displayed via the `display' property.  That's the reason we can't
-   simply use find_next_newline_no_quit.
+   simply use find_newline_no_quit.
 
    Note that this function may not skip over invisible text that is so
    because of text properties and immediately follows a newline.  If
@@ -6014,7 +6013,7 @@ forward_to_next_line_start (struct it *it, int *skipped_p,
   if (!newline_found_p)
     {
       ptrdiff_t bytepos, start = IT_CHARPOS (*it);
-      ptrdiff_t limit = find_next_newline_no_quit (start, 1, &bytepos);
+      ptrdiff_t limit = find_newline_no_quit (start, 1, &bytepos);
       Lisp_Object pos;
 
       eassert (!STRINGP (it->string));
@@ -7474,9 +7473,8 @@ get_visually_first_element (struct it *it)
       if (string_p)
         it->bidi_it.charpos = it->bidi_it.bytepos = 0;
       else
-        it->bidi_it.charpos
-          = find_next_newline_no_quit (IT_CHARPOS (*it), -1,
-                                       &it->bidi_it.bytepos);
+        it->bidi_it.charpos = find_newline_no_quit (IT_CHARPOS (*it), -1,
+                                                    &it->bidi_it.bytepos);
       bidi_paragraph_init (it->paragraph_embedding, &it->bidi_it, 1);
       do
         {
@@ -9123,8 +9121,8 @@ move_it_vertically_backward (struct it *it, int dy)
           && IT_CHARPOS (*it) > BEGV
           && FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n')
         {
-          ptrdiff_t nl_pos =
-            find_next_newline_no_quit (IT_CHARPOS (*it) - 1, -1, NULL);
+          ptrdiff_t nl_pos = find_newline_no_quit (IT_CHARPOS (*it) - 1, -1,
+                                                   NULL);
 
           move_it_to (it, nl_pos, -1, -1, -1, MOVE_TO_POS);
         }