summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Blandy <jimb@redhat.com>1991-03-01 21:55:53 +0000
committerJim Blandy <jimb@redhat.com>1991-03-01 21:55:53 +0000
commit3bfd7edbe7d3b56abc5a2ecb097e3cd594e3bf19 (patch)
tree43c1fa962bf9b7ba0ed56d206a77d630147c955c
parent56d506fcff55e31114063320005b319f1665eaa7 (diff)
downloademacs-3bfd7edbe7d3b56abc5a2ecb097e3cd594e3bf19.tar.gz
*** empty log message ***
-rw-r--r--lisp/emacs-lisp/float.el11
-rw-r--r--lisp/float-sup.el3
-rw-r--r--lisp/mail/rmailout.el9
3 files changed, 12 insertions, 11 deletions
diff --git a/lisp/emacs-lisp/float.el b/lisp/emacs-lisp/float.el
index ce2ab101278..68b88f41ecc 100644
--- a/lisp/emacs-lisp/float.el
+++ b/lisp/emacs-lisp/float.el
@@ -386,11 +386,10 @@ Optional second argument non-nil means use scientific notation."
;; digits of the exponent.
(defun string-to-float (str)
"Convert the string to a floating point number.
-Accepts a decimal string in scientific notation,
-with exponent preceded by either E or e.
-Only the 6 most significant digits of the integer and fractional parts
-are used; only the first two digits of the exponent are used.
-Negative signs preceding both the decimal number and the exponent
+Accepts a decimal string in scientific notation, with exponent preceded
+by either E or e. Only the six most significant digits of the integer
+and fractional parts are used; only the first two digits of the exponent
+are used. Negative signs preceding both the decimal number and the exponent
are recognized."
(if (string-match floating-point-regexp str 0)
@@ -447,5 +446,3 @@ are recognized."
(funcall func exponent (aref powers-of-10 tens)))))
_f0)) ; if invalid, return 0
-
-
diff --git a/lisp/float-sup.el b/lisp/float-sup.el
index bf95369fd82..d7b756238d3 100644
--- a/lisp/float-sup.el
+++ b/lisp/float-sup.el
@@ -42,8 +42,7 @@
(defconst radians-to-degrees (/ 180.0 pi)
"Radian to degree conversion constant")
-;; these expand to a single multiply by a float
-;; when byte compiled
+;; these expand to a single multiply by a float when byte compiled
(defmacro degrees-to-radians (x)
"Convert ARG from degrees to radians."
diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el
index a02c2260fd3..a4018b5cf52 100644
--- a/lisp/mail/rmailout.el
+++ b/lisp/mail/rmailout.el
@@ -50,7 +50,9 @@ starting with the current one. Deleted messages are skipped and don't count."
(setq tail (cdr tail))))
;; If not suggestions, use same file as last time.
(or answer rmail-last-rmail-file)))))
- (setq file-name (expand-file-name file-name))
+ (setq file-name
+ (expand-file-name file-name
+ (file-name-directory rmail-last-rmail-file)))
(setq rmail-last-rmail-file file-name)
(rmail-maybe-set-message-counters)
(or (get-file-buffer file-name)
@@ -129,7 +131,10 @@ starting with the current one. Deleted messages are skipped and don't count."
": "))
(and rmail-last-file (file-name-directory rmail-last-file))
rmail-last-file)))
- (setq file-name (expand-file-name file-name))
+ (setq file-name
+ (expand-file-name file-name
+ (and rmail-last-file
+ (file-name-directory rmail-last-file))))
(setq rmail-last-file file-name)
(while (> count 0)
(let ((rmailbuf (current-buffer))