procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into feature/android

Browse source
This commit is contained in:
Po Lu 2023-07-24 08:09:36 +08:00
commit b7de14b56f
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/proced.el
View file

@ -152,7 +152,7 @@ the external command (usually \"kill\")."
(pri "Pr" "%d" right proced-< t (pri pid) (nil t t))
(nice "Ni" "%3d" 3 proced-< t (nice pid) (t t nil))
(thcount "THCount" "%d" right proced-< t (thcount pid) (nil t t))
(start "Start" proced-format-start 6 proced-time-lessp nil (start pid)
(start "Start" proced-format-start left proced-time-lessp nil (start pid)
(t t nil))
(vsize "VSize" proced-format-memory right proced-< t (vsize pid)
(nil t t))
@ -1599,8 +1599,7 @@ Prefix ARG controls sort order, see `proced-sort-interactive'."
(format "%02d%s%02d" minutes colon seconds)))))
(defun proced-format-start (start)
"Format time START.
The return string is always 6 characters wide."
"Format time START."
(let ((d-start (decode-time start))
(d-current (decode-time))
(colon (if proced-enable-color-flag

2
src/pdumper.c
View file

@ -2178,7 +2178,7 @@ dump_interval_node (struct dump_context *ctx, struct itree_node *node,
static dump_off
dump_overlay (struct dump_context *ctx, const struct Lisp_Overlay *overlay)
{
#if CHECK_STRUCTS && !defined (HASH_Lisp_Overlay_EB4C05D8D2)
#if CHECK_STRUCTS && !defined (HASH_Lisp_Overlay_5F9D7E02FC)
# error "Lisp_Overlay changed. See CHECK_STRUCTS comment in config.h."
#endif
START_DUMP_PVEC (ctx, &overlay->header, struct Lisp_Overlay, out);

9
src/xdisp.c
View file

@ -17661,7 +17661,14 @@ mark_window_display_accurate_1 (struct window *w, bool accurate_p)
report_point_change (WINDOW_XFRAME (w), w, b);
#endif /* HAVE_TEXT_CONVERSION */
w->window_end_valid = true;
struct glyph_row *row;
/* These conditions should be consistent with CHECK_WINDOW_END. */
if (w->window_end_vpos < w->current_matrix->nrows
&& ((row = MATRIX_ROW (w->current_matrix, w->window_end_vpos),
!row->enabled_p
|| MATRIX_ROW_DISPLAYS_TEXT_P (row)
|| MATRIX_ROW_VPOS (row, w->current_matrix) == 0)))
w->window_end_valid = true;
w->update_mode_line = false;
w->preserve_vscroll_p = false;
}