Mercurial > emacs
diff lisp/calc/calc-frac.el @ 90159:08185296b491
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-44
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 272-288)
- src/xdisp.c (dump_glyph_row): Don't display overlay_arrow_p field.
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 67)
- Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Thu, 05 May 2005 00:04:55 +0000 |
| parents | f2ebccfa87d4 e0224a91347d |
| children | 187d6a1f84f7 |
line wrap: on
line diff
--- a/lisp/calc/calc-frac.el Thu Apr 28 04:56:56 2005 +0000 +++ b/lisp/calc/calc-frac.el Thu May 05 00:04:55 2005 +0000 @@ -1,6 +1,6 @@ ;;; calc-frac.el --- fraction functions for Calc -;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> ;; Maintainer: Jay Belanger <belanger@truman.edu> @@ -56,7 +56,7 @@ (if (string-match "\\`\\([^ 0-9][^ 0-9]?\\)[0-9]*\\'" fmt) (let ((n nil)) (if (/= (match-end 0) (match-end 1)) - (setq n (string-to-int (substring fmt (match-end 1))) + (setq n (string-to-number (substring fmt (match-end 1))) fmt (math-match-substring fmt 1))) (if (eq n 0) (error "Bad denominator")) (calc-change-mode 'calc-frac-format (list fmt n) t))