summaryrefslogtreecommitdiff
path: root/lisp/emulation
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2005-05-16 11:34:49 +0000
committerJuanma Barranquero <lekktu@gmail.com>2005-05-16 11:34:49 +0000
commit027a4b6b3fd229f8aea323f59cb246d99deb8a75 (patch)
treec92da7d3049376d7bd687db6bc5c8dce82ed9335 /lisp/emulation
parent216d380630ec8be9569a56687f0e08b89ee97c47 (diff)
downloademacs-027a4b6b3fd229f8aea323f59cb246d99deb8a75.tar.gz
Replace `string-to-int' by `string-to-number'.
Diffstat (limited to 'lisp/emulation')
-rw-r--r--lisp/emulation/edt.el8
-rw-r--r--lisp/emulation/tpu-extras.el8
-rw-r--r--lisp/emulation/vip.el6
-rw-r--r--lisp/emulation/viper-ex.el8
4 files changed, 15 insertions, 15 deletions
diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el
index ff0298e9a17..01f0af6f307 100644
--- a/lisp/emulation/edt.el
+++ b/lisp/emulation/edt.el
@@ -1256,16 +1256,16 @@ Argument BOTTOM is the bottom margin in number of lines or percent of window."
;; set top scroll margin
(or (string= top "")
(if (string= "%" (substring top -1))
- (setq edt-top-scroll-margin (string-to-int top))
+ (setq edt-top-scroll-margin (string-to-number top))
(setq edt-top-scroll-margin
- (/ (1- (+ (* (string-to-int top) 100) (window-height)))
+ (/ (1- (+ (* (string-to-number top) 100) (window-height)))
(window-height)))))
;; set bottom scroll margin
(or (string= bottom "")
(if (string= "%" (substring bottom -1))
- (setq edt-bottom-scroll-margin (string-to-int bottom))
+ (setq edt-bottom-scroll-margin (string-to-number bottom))
(setq edt-bottom-scroll-margin
- (/ (1- (+ (* (string-to-int bottom) 100) (window-height)))
+ (/ (1- (+ (* (string-to-number bottom) 100) (window-height)))
(window-height)))))
;; report scroll margin settings if running interactively
(and (interactive-p)
diff --git a/lisp/emulation/tpu-extras.el b/lisp/emulation/tpu-extras.el
index ced88ff3fdf..9c417dd3a40 100644
--- a/lisp/emulation/tpu-extras.el
+++ b/lisp/emulation/tpu-extras.el
@@ -440,16 +440,16 @@ version that respects the bottom scroll margin."
;; set top scroll margin
(or (string= top "")
(if (string= "%" (substring top -1))
- (setq tpu-top-scroll-margin (string-to-int top))
+ (setq tpu-top-scroll-margin (string-to-number top))
(setq tpu-top-scroll-margin
- (/ (1- (+ (* (string-to-int top) 100) (window-height)))
+ (/ (1- (+ (* (string-to-number top) 100) (window-height)))
(window-height)))))
;; set bottom scroll margin
(or (string= bottom "")
(if (string= "%" (substring bottom -1))
- (setq tpu-bottom-scroll-margin (string-to-int bottom))
+ (setq tpu-bottom-scroll-margin (string-to-number bottom))
(setq tpu-bottom-scroll-margin
- (/ (1- (+ (* (string-to-int bottom) 100) (window-height)))
+ (/ (1- (+ (* (string-to-number bottom) 100) (window-height)))
(window-height)))))
;; report scroll margin settings if running interactively
(and (interactive-p)
diff --git a/lisp/emulation/vip.el b/lisp/emulation/vip.el
index af878085ba8..19f08d54989 100644
--- a/lisp/emulation/vip.el
+++ b/lisp/emulation/vip.el
@@ -2177,7 +2177,7 @@ a token has type \(command, address, end-mark\) and value."
(cond ((string= ex-token-type "plus") "add-number")
((string= ex-token-type "minus") "sub-number")
(t "abs-number")))
- (setq ex-token (string-to-int (buffer-substring (point) (mark)))))
+ (setq ex-token (string-to-number (buffer-substring (point) (mark)))))
((looking-at "\\$")
(forward-char 1)
(setq ex-token-type "end"))
@@ -2471,7 +2471,7 @@ a token has type \(command, address, end-mark\) and value."
(progn
(set-mark (point))
(re-search-forward "[0-9][0-9]*")
- (setq ex-count (string-to-int (buffer-substring (point) (mark))))
+ (setq ex-count (string-to-number (buffer-substring (point) (mark))))
(skip-chars-forward " \t")))
(if (looking-at "[pl#]")
(progn
@@ -2496,7 +2496,7 @@ a token has type \(command, address, end-mark\) and value."
(progn
(set-mark (point))
(re-search-forward "[0-9][0-9]*")
- (setq ex-count (string-to-int (buffer-substring (point) (mark))))
+ (setq ex-count (string-to-number (buffer-substring (point) (mark))))
(skip-chars-forward " \t")))
(if (looking-at "[pl#]")
(progn
diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el
index 90b006ffb65..9f33bdbad53 100644
--- a/lisp/emulation/viper-ex.el
+++ b/lisp/emulation/viper-ex.el
@@ -434,7 +434,7 @@ reversed."
((eq ex-token-type 'minus) 'sub-number)
(t 'abs-number)))
(setq ex-token
- (string-to-int (buffer-substring (point) (mark t)))))
+ (string-to-number (buffer-substring (point) (mark t)))))
((looking-at "\\$")
(forward-char 1)
(setq ex-token-type 'end))
@@ -912,7 +912,7 @@ reversed."
(progn
(set-mark (point))
(re-search-forward "[0-9][0-9]*")
- (setq ex-count (string-to-int (buffer-substring (point) (mark t))))
+ (setq ex-count (string-to-number (buffer-substring (point) (mark t))))
(skip-chars-forward " \t")))
(if (looking-at "[pl#]")
(progn
@@ -938,7 +938,7 @@ reversed."
(progn
(set-mark (point))
(re-search-forward "[0-9][0-9]*")
- (setq ex-count (string-to-int (buffer-substring (point) (mark t))))
+ (setq ex-count (string-to-number (buffer-substring (point) (mark t))))
(skip-chars-forward " \t")))
(if (looking-at "[pl#]")
(progn
@@ -1490,7 +1490,7 @@ reversed."
(progn
(ex-edit t)
(throw 'ex-edit nil))
- (setq count (string-to-int ex-file))
+ (setq count (string-to-number ex-file))
(if (= count 0) (setq count 1))
(if (< count 0) (error "Usage: `next <count>' (count >= 0)"))))
(setq count 1))