Improve the UI of 'list-timers'

* lisp/emacs-lisp/timer-list.el (list-timers): Display both "Next"
and "Repeat" in units of seconds, for consistency.
(timer-list-mode): Add help-echo to column headers.

2 files changed, 16 insertions, 5 deletions

diff --git a/lisp/emacs-lisp/timer-list.el b/lisp/emacs-lisp/timer-list.el
index 4fa31f32673..4cebd739c3b 100644
--- a/lisp/emacs-lisp/timer-list.el
+++ b/lisp/emacs-lisp/timer-list.el
@@ -52,7 +52,7 @@
                       (let ((repeat (aref timer 4)))
                         (cond
                          ((numberp repeat)
-                          (format "%.2f" (/ repeat 60)))
+                          (format "%.1f" repeat))
                          ((null repeat)
                           "-")
                          (t
@@ -91,7 +91,18 @@
   (setq header-line-format
         (concat (propertize " " 'display '(space :align-to 0))
                 (format "%4s %10s %8s %s"
-                "Idle" "Next" "Repeat" "Function"))))
+                        (propertize "Idle"
+                                    'mouse-face 'highlight
+                                    'help-echo "* marks idle timers")
+                        (propertize "Next"
+                                    'mouse-face 'highlight
+                                    'help-echo "Time in sec till next invocation")
+                        (propertize "Repeat"
+                                    'mouse-face 'highlight
+                                    'help-echo "Symbol: repeat; number: repeat interval in sec")
+                        (propertize "Function"
+                                    'mouse-face 'highlight
+                                    'help-echo "Function called by timer")))))
 
 (defun timer-list-cancel ()
   "Cancel the timer on the line under point."
diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index 2952242c251..8851522bbdb 100644
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -435,9 +435,9 @@ not contain `d', so that a full listing is expected."
         ;; text.  But if the listing is empty, as e.g. in empty
         ;; directories with -a removed from switches, point will be
         ;; before the inserted text, and dired-insert-directory will
-        ;; not indent the listing correctly.  Going to the end of the
-        ;; buffer fixes that.
-        (unless files (goto-char (point-max)))
+        ;; not indent the listing correctly.  Getting past the
+        ;; inserted text solves this.
+        (unless (cdr total-line) (forward-line 2))
         (if (memq ?R switches)
             ;; List the contents of all directories recursively.
             ;; cadr of each element of `file-alist' is t for