branch: elpa/vm commit 250c526adeb60924c13cb9f23a942ab0fed3d0e5 Merge: a1e5b13242 df8685c8f7 Author: Mark Diekhans <ma...@ucsc.edu> Commit: Mark Diekhans <ma...@ucsc.edu>
Merge branch 'main' into 'main' remove uncessary informative message and wait See merge request emacs-vm/vm!46 --- lisp/vm-biff.el | 4 +++- lisp/vm-rfaddons.el | 5 +---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lisp/vm-biff.el b/lisp/vm-biff.el index fd851ee5de..8347567876 100644 --- a/lisp/vm-biff.el +++ b/lisp/vm-biff.el @@ -516,7 +516,9 @@ AddToFunc SelectWindow (run-at-time vm-biff-auto-remove nil 'vm-biff-timer-delete-popup wf)))))))) -(add-hook 'vm-arrived-messages-hook 'vm-biff-popup t) +; add hook only when explictly requring this module +(when (not (or byte-compile-current-file (bound-and-true-p comp-compile-warning-errors))) + (add-hook 'vm-arrived-messages-hook 'vm-biff-popup t)) (provide 'vm-biff) ;;; vm-biff.el ends here. diff --git a/lisp/vm-rfaddons.el b/lisp/vm-rfaddons.el index 4285490589..71a5240305 100644 --- a/lisp/vm-rfaddons.el +++ b/lisp/vm-rfaddons.el @@ -328,10 +328,7 @@ or do the binding and advising on your own. (Rob F)" (when option-list (message "VM-RFADDONS: The following options are unknown: %s" option-list) (ding) - (sit-for 3)) - - (message "VM-RFADDONS: Options loaded.") - (vm-sit-for (or sit-for 2))) + (sit-for 3))) (defun rf-vm-su-labels (m) "This version does some sanity checking. (Rob F)"