From a7f5d04fbf9ed4a095a242892a58bf28f1287fda Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 2 Oct 2014 13:18:57 -0400 Subject: [PATCH] * lisp/obsolete/lucid.el (read-number): Remove, redundant. * lisp/obsolete/cl-compat.el (cl-floor, cl-ceiling, cl-round, cl-truncate): Remove, broken. --- lisp/ChangeLog | 6 ++++++ lisp/obsolete/cl-compat.el | 8 -------- lisp/obsolete/lucid.el | 21 --------------------- 3 files changed, 6 insertions(+), 29 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index aa8ce36325d..e5ef6703e68 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-10-02 Stefan Monnier + + * obsolete/lucid.el (read-number): Remove, redundant. + * obsolete/cl-compat.el (cl-floor, cl-ceiling, cl-round, cl-truncate): + Remove, broken. + 2014-10-02 Glenn Morris * emacs-lisp/package.el (package-import-keyring): diff --git a/lisp/obsolete/cl-compat.el b/lisp/obsolete/cl-compat.el index 191f885a900..bd702a84a25 100644 --- a/lisp/obsolete/cl-compat.el +++ b/lisp/obsolete/cl-compat.el @@ -129,14 +129,6 @@ (if test-not (not (funcall test-not item elt)) (funcall (or test 'eql) item elt)))) - -;;; Rounding functions with old-style multiple value returns. - -(defun cl-floor (a &optional b) (Values-list (floor* a b))) -(defun cl-ceiling (a &optional b) (Values-list (ceiling* a b))) -(defun cl-round (a &optional b) (Values-list (round* a b))) -(defun cl-truncate (a &optional b) (Values-list (truncate* a b))) - (defun safe-idiv (a b) (let* ((q (/ (abs a) (abs b))) (s (* (signum a) (signum b)))) diff --git a/lisp/obsolete/lucid.el b/lisp/obsolete/lucid.el index 15f80652809..2c6efa408ff 100644 --- a/lisp/obsolete/lucid.el +++ b/lisp/obsolete/lucid.el @@ -30,27 +30,6 @@ (defalias 'current-time-seconds 'current-time) -(defun read-number (prompt &optional integers-only) - "Read a number from the minibuffer. -Keep reentering the minibuffer until we get suitable input. -If optional argument INTEGERS-ONLY is non-nil, insist on an integer." - (interactive) - (let (success - (number nil) - (predicate (if integers-only 'integerp 'numberp))) - (while (not success) - (let ((input-string (read-string prompt))) - (condition-case () - (setq number (read input-string)) - (error)) - (if (funcall predicate number) - (setq success t) - (let ((cursor-in-echo-area t)) - (message "Please type %s" - (if integers-only "an integer" "a number")) - (sit-for 1))))) - number)) - (defun real-path-name (name &optional default) (file-truename (expand-file-name name default))) -- 2.39.5