master updated (e2eb58c -> 36964b2)

[Eli Zaretskii]

eliz pushed a change to branch master.

      from  e2eb58c   Mark up commands in shortdoc.el for modes
       new  fdf148c   Fix unwarranted point movement after C-g
       new  36964b2   ; * src/xdisp.c (display_mode_lines): Fix comment.


Summary of changes:
 src/xdisp.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)