* lisp/obsolete/lucid.el (read-number): Remove, redundant.

* lisp/obsolete/cl-compat.el (cl-floor, cl-ceiling, cl-round, cl-truncate):
Remove, broken.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aa8ce36325d793fca981c5ed17c52bb7b84b9754..e5ef6703e68a75a02ea3c6310e2f58b092dccb77 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * 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  <rgm@gnu.org>
 
        * emacs-lisp/package.el (package-import-keyring):

diff --git a/lisp/obsolete/cl-compat.el b/lisp/obsolete/cl-compat.el
index 191f885a900368430f882e797632b422ffeb85f0..bd702a84a254c151902a06b805d2c042186aef0d 100644 (file)
--- 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 15f806528094fcd3c0fbf5a58a1a2cdbb5d235ad..2c6efa408ffc3ae036349f0e1f6d43c995f2c07d 100644 (file)
--- 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)))