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

Merge remote-tracking branch 'savannah/master' into HEAD

Browse source
This commit is contained in:
Andrea Corallo 2020-03-29 12:31:24 +01:00
commit 00ee320a62
66 changed files with 1121 additions and 885 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/emacs-lisp/cl-macs.el
View file

@ -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)

15
lisp/emacs-lisp/timer-list.el
View file

@ -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."