diff options
| author | Paul Eggert | 2019-06-20 00:01:06 -0700 |
|---|---|---|
| committer | Paul Eggert | 2019-06-20 00:41:13 -0700 |
| commit | 5f32ac13c8b42e2a4eaadea1c4d0888ef341c9cd (patch) | |
| tree | 8e856fa594bfd7097c1df556f1ff4d4668174d8c | |
| parent | fdbbbf94a5ed233571478d94c812644bdfaeb600 (diff) | |
| download | emacs-5f32ac13c8b42e2a4eaadea1c4d0888ef341c9cd.tar.gz emacs-5f32ac13c8b42e2a4eaadea1c4d0888ef341c9cd.zip | |
Minor putc tweaks
* src/emacs-module.c (module_abort):
* src/xdisp.c (vmessage):
Prefer fputc to putc, since speed isn’t crucial here.
* src/region-cache.c (pp_cache) [ENABLE_CHECKING]: Simplify.
| -rw-r--r-- | src/emacs-module.c | 2 | ||||
| -rw-r--r-- | src/region-cache.c | 16 | ||||
| -rw-r--r-- | src/xdisp.c | 4 |
3 files changed, 8 insertions, 14 deletions
diff --git a/src/emacs-module.c b/src/emacs-module.c index 907a5d8225a..c856663d2ff 100644 --- a/src/emacs-module.c +++ b/src/emacs-module.c | |||
| @@ -1304,7 +1304,7 @@ module_abort (const char *format, ...) | |||
| 1304 | va_start (args, format); | 1304 | va_start (args, format); |
| 1305 | vfprintf (stderr, format, args); | 1305 | vfprintf (stderr, format, args); |
| 1306 | va_end (args); | 1306 | va_end (args); |
| 1307 | putc ('\n', stderr); | 1307 | fputc ('\n', stderr); |
| 1308 | fflush (NULL); | 1308 | fflush (NULL); |
| 1309 | emacs_abort (); | 1309 | emacs_abort (); |
| 1310 | } | 1310 | } |
diff --git a/src/region-cache.c b/src/region-cache.c index d2e3d94829b..57a26f2fa64 100644 --- a/src/region-cache.c +++ b/src/region-cache.c | |||
| @@ -759,7 +759,6 @@ void pp_cache (struct region_cache *) EXTERNALLY_VISIBLE; | |||
| 759 | void | 759 | void |
| 760 | pp_cache (struct region_cache *c) | 760 | pp_cache (struct region_cache *c) |
| 761 | { | 761 | { |
| 762 | ptrdiff_t i; | ||
| 763 | ptrdiff_t beg_u = c->buffer_beg + c->beg_unchanged; | 762 | ptrdiff_t beg_u = c->buffer_beg + c->beg_unchanged; |
| 764 | ptrdiff_t end_u = c->buffer_end - c->end_unchanged; | 763 | ptrdiff_t end_u = c->buffer_end - c->end_unchanged; |
| 765 | 764 | ||
| @@ -768,19 +767,14 @@ pp_cache (struct region_cache *c) | |||
| 768 | c->buffer_beg, c->buffer_end, | 767 | c->buffer_beg, c->buffer_end, |
| 769 | beg_u, end_u); | 768 | beg_u, end_u); |
| 770 | 769 | ||
| 771 | for (i = 0; i < c->cache_len; i++) | 770 | for (ptrdiff_t i = 0; i < c->cache_len; i++) |
| 772 | { | 771 | { |
| 773 | ptrdiff_t pos = BOUNDARY_POS (c, i); | 772 | ptrdiff_t pos = BOUNDARY_POS (c, i); |
| 774 | 773 | ||
| 775 | putc (((pos < beg_u) ? 'v' | 774 | fprintf (stderr, "%c%c%"pD"d : %d\n", |
| 776 | : (pos == beg_u) ? '-' | 775 | pos < beg_u ? 'v' : pos == beg_u ? '-' : ' ', |
| 777 | : ' '), | 776 | pos > end_u ? '^' : pos == end_u ? '-' : ' ', |
| 778 | stderr); | 777 | pos, BOUNDARY_VALUE (c, i)); |
| 779 | putc (((pos > end_u) ? '^' | ||
| 780 | : (pos == end_u) ? '-' | ||
| 781 | : ' '), | ||
| 782 | stderr); | ||
| 783 | fprintf (stderr, "%"pD"d : %d\n", pos, BOUNDARY_VALUE (c, i)); | ||
| 784 | } | 778 | } |
| 785 | } | 779 | } |
| 786 | 780 | ||
diff --git a/src/xdisp.c b/src/xdisp.c index dc5101d5aca..945174e09c5 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -10845,11 +10845,11 @@ vmessage (const char *m, va_list ap) | |||
| 10845 | if (m) | 10845 | if (m) |
| 10846 | { | 10846 | { |
| 10847 | if (noninteractive_need_newline) | 10847 | if (noninteractive_need_newline) |
| 10848 | putc ('\n', stderr); | 10848 | fputc ('\n', stderr); |
| 10849 | noninteractive_need_newline = false; | 10849 | noninteractive_need_newline = false; |
| 10850 | vfprintf (stderr, m, ap); | 10850 | vfprintf (stderr, m, ap); |
| 10851 | if (!cursor_in_echo_area) | 10851 | if (!cursor_in_echo_area) |
| 10852 | fprintf (stderr, "\n"); | 10852 | fputc ('\n', stderr); |
| 10853 | fflush (stderr); | 10853 | fflush (stderr); |
| 10854 | } | 10854 | } |
| 10855 | } | 10855 | } |