4 files changed, 23 insertions, 23 deletions

diff --git a/editors/awk.c b/editors/awk.c
index 42f6ef866..3224788c0 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -155,7 +155,7 @@ typedef struct tsplitter_s {
 
 /* simple token classes */
 /* Order and hex values are very important!!!  See next_token() */
-#define TC_SEQSTART      1                              /* ( */
+#define TC_SEQSTART     1                       /* ( */
 #define TC_SEQTERM      (1 << 1)                /* ) */
 #define TC_REGEXP       (1 << 2)                /* /.../ */
 #define TC_OUTRDR       (1 << 3)                /* | > >> */
diff --git a/editors/diff.c b/editors/diff.c
index 3a3334640..b08ded3a1 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -843,7 +843,7 @@ static void diffdir(char *p[2], const char *s_start)
                  * add_to_dirlist will remove it. */
                 list[i].len = strlen(p[i]);
                 recursive_action(p[i], ACTION_RECURSE | ACTION_FOLLOWLINKS,
-                                 add_to_dirlist, skip_dir, &list[i], 0);
+                                add_to_dirlist, skip_dir, &list[i], 0);
                 /* Sort dl alphabetically.
                  * GNU diff does this ignoring any number of trailing dots.
                  * We don't, so for us dotted files almost always are
diff --git a/editors/sed.c b/editors/sed.c
index 070af611a..f8ca5d351 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -1077,7 +1077,7 @@ static void process_files(void)
                                 /* or does this line matches our last address regex */
                                 || (sed_cmd->end_match && old_matched
                                      && (regexec(sed_cmd->end_match,
-                                                 pattern_space, 0, NULL, 0) == 0)
+                                                pattern_space, 0, NULL, 0) == 0)
                                 )
                         );
                 }
diff --git a/editors/vi.c b/editors/vi.c
index 821583ec1..1fc66b931 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -14,7 +14,7 @@
  *      add :help command
  *      :map macros
  *      if mark[] values were line numbers rather than pointers
- *         it would be easier to change the mark when add/delete lines
+ *      it would be easier to change the mark when add/delete lines
  *      More intelligence in refresh()
  *      ":r !cmd"  and  "!cmd"  to filter text through an external command
  *      A true "undo" facility
@@ -1049,7 +1049,7 @@ static void colon(char *buf)
 #endif
                 // how many lines in text[]?
                 li = count_lines(text, end - 1);
-                status_line("\"%s\"%s"
+                status_line("'%s'%s"
                         IF_FEATURE_VI_READONLY("%s")
                         " %dL, %dC", current_filename,
                         (file_size(fn) < 0 ? " [New file]" : ""),
@@ -1165,7 +1165,7 @@ static void colon(char *buf)
                         goto ret;       // nothing was inserted
                 // how many lines in text[]?
                 li = count_lines(q, q + ch - 1);
-                status_line("\"%s\""
+                status_line("'%s'"
                         IF_FEATURE_VI_READONLY("%s")
                         " %dL, %dC", fn,
                         IF_FEATURE_VI_READONLY((readonly_mode ? " [Readonly]" : ""),)
@@ -1298,7 +1298,7 @@ static void colon(char *buf)
                 }
 #if ENABLE_FEATURE_VI_READONLY
                 if (readonly_mode && !useforce) {
-                        status_line_bold("\"%s\" File is read only", fn);
+                        status_line_bold("'%s' is read only", fn);
                         goto ret;
                 }
 #endif
@@ -1321,9 +1321,9 @@ static void colon(char *buf)
                 }
                 if (l < 0) {
                         if (l == -1)
-                                status_line_bold("\"%s\" %s", fn, strerror(errno));
+                                status_line_bold("'%s' %s", fn, strerror(errno));
                 } else {
-                        status_line("\"%s\" %dL, %dC", fn, li, l);
+                        status_line("'%s' %dL, %dC", fn, li, l);
                         if (q == text && r == end - 1 && l == ch) {
                                 file_modified = 0;
                                 last_file_modified = -1;
@@ -1735,7 +1735,7 @@ static char *char_search(char *p, const char *pat, int dir, int range)
         q = (char *)re_compile_pattern(pat, strlen(pat), (struct re_pattern_buffer *)&preg);
         if (q != 0) {
                 // The pattern was not compiled
-                status_line_bold("bad search pattern: \"%s\": %s", pat, q);
+                status_line_bold("bad search pattern: '%s': %s", pat, q);
                 i = 0;                  // return p if pattern not compiled
                 goto cs1;
         }
@@ -1929,11 +1929,11 @@ static int find_range(char **start, char **stop, char c)
                 dot_end();              // find NL
                 q = dot;
         } else {
-            // nothing -- this causes any other values of c to
-            // represent the one-character range under the
-            // cursor.  this is correct for ' ' and 'l', but
-            // perhaps no others.
-            //
+                // nothing -- this causes any other values of c to
+                // represent the one-character range under the
+                // cursor.  this is correct for ' ' and 'l', but
+                // perhaps no others.
+                //
         }
         if (q < p) {
                 t = q;
@@ -2512,12 +2512,12 @@ static int file_insert(const char *fn, char *p, int update_ro_status)
 
         /* Validate file */
         if (stat(fn, &statbuf) < 0) {
-                status_line_bold("\"%s\" %s", fn, strerror(errno));
+                status_line_bold("'%s' %s", fn, strerror(errno));
                 goto fi0;
         }
         if (!S_ISREG(statbuf.st_mode)) {
                 // This is not a regular file
-                status_line_bold("\"%s\" Not a regular file", fn);
+                status_line_bold("'%s' is not a regular file", fn);
                 goto fi0;
         }
         if (p < text || p > end) {
@@ -2528,19 +2528,19 @@ static int file_insert(const char *fn, char *p, int update_ro_status)
         // read file to buffer
         fd = open(fn, O_RDONLY);
         if (fd < 0) {
-                status_line_bold("\"%s\" %s", fn, strerror(errno));
+                status_line_bold("'%s' %s", fn, strerror(errno));
                 goto fi0;
         }
-        size = statbuf.st_size;
+        size = (statbuf.st_size < INT_MAX ? (int)statbuf.st_size : INT_MAX);
         p += text_hole_make(p, size);
         cnt = safe_read(fd, p, size);
         if (cnt < 0) {
-                status_line_bold("\"%s\" %s", fn, strerror(errno));
+                status_line_bold("'%s' %s", fn, strerror(errno));
                 p = text_hole_delete(p, p + size - 1);  // un-do buffer insert
         } else if (cnt < size) {
                 // There was a partial read, shrink unused space text[]
                 p = text_hole_delete(p + cnt, p + (size - cnt) - 1);    // un-do buffer insert
-                status_line_bold("can't read all of file \"%s\"", fn);
+                status_line_bold("can't read '%s'", fn);
         }
         if (cnt >= size)
                 file_modified++;
@@ -3478,7 +3478,7 @@ static void do_cmd(int c)
                         } else {
                                 file_modified = 0;
                                 last_file_modified = -1;
-                                status_line("\"%s\" %dL, %dC", current_filename, count_lines(text, end - 1), cnt);
+                                status_line("'%s' %dL, %dC", current_filename, count_lines(text, end - 1), cnt);
                                 if (p[0] == 'x' || p[1] == 'q' || p[1] == 'n'
                                  || p[0] == 'X' || p[1] == 'Q' || p[1] == 'N'
                                 ) {
@@ -3676,7 +3676,7 @@ static void do_cmd(int c)
                 }
                 if (file_modified) {
                         if (ENABLE_FEATURE_VI_READONLY && readonly_mode) {
-                                status_line_bold("\"%s\" File is read only", current_filename);
+                                status_line_bold("'%s' is read only", current_filename);
                                 break;
                         }
                         cnt = file_write(current_filename, text, end - 1);