diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-03-29 12:31:24 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-03-29 12:31:24 +0100 |
| commit | 00ee320a620704ae12a1e2104c2d08bf8bbdf0c9 (patch) | |
| tree | 498c59219b572c89e10f9521b54c98896cb52ca9 /lisp/emacs-lisp | |
| parent | 530faee2752c7b316fa21f2ac4d1266d3e7a38e6 (diff) | |
| parent | 76b3bd8cbb9a0a01941d9c1766c054960e4bfd97 (diff) | |
| download | emacs-00ee320a620704ae12a1e2104c2d08bf8bbdf0c9.tar.gz emacs-00ee320a620704ae12a1e2104c2d08bf8bbdf0c9.tar.bz2 emacs-00ee320a620704ae12a1e2104c2d08bf8bbdf0c9.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/cl-macs.el | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/timer-list.el | 15 |
2 files changed, 17 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 954731b06b8..7f5d197b532 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -2868,7 +2868,9 @@ Supported keywords for slots are: (append pred-form '(t)) `(and ,pred-form t))) forms) - (push `(put ',name 'cl-deftype-satisfies ',predicate) forms)) + (push `(eval-and-compile + (put ',name 'cl-deftype-satisfies ',predicate)) + forms)) (let ((pos 0) (descp descs)) (while descp (let* ((desc (pop descp)) @@ -3138,6 +3140,7 @@ Of course, we really can't know that for sure, so it's just a heuristic." ;; "Obvious" mappings. (string . stringp) (list . listp) + (cons . consp) (symbol . symbolp) (function . functionp) (integer . integerp) 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." |