Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions emacs/auc-menu.el
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ DOC is the documentation string, and MENU is a Lucid style menu."

;;; Emacs 18

((< (string-to-int emacs-version) 19)
((< (string-to-number emacs-version) 19)

(defun easy-menu-do-define (symbol maps doc menu)
(fset symbol (symbol-function 'ignore)))
Expand Down Expand Up @@ -244,7 +244,7 @@ Call this from 'activate-menubar-hook' to implement dynamic menus."

(defun easy-menu-add (menu &optional map)
(and (string-match "^19\\.\\([0-9]+\\)" emacs-version)
(< 22 (string-to-int (substring emacs-version
(< 22 (string-to-number (substring emacs-version
(match-beginning 1) (match-end 1))))
(x-popup-menu nil menu)))

Expand Down
8 changes: 4 additions & 4 deletions emacs/twelf.el
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,7 @@ read a file name from the minibuffer."
(defun looked-at-nth-int (n)
(let ((str (looked-at-nth n)))
(if (null str) nil
(string-to-int str))))
(string-to-number str))))

(defun twelf-error-parser (pt)
"Standard parser for Twelf errors.
Expand Down Expand Up @@ -1610,9 +1610,9 @@ server buffer."
(setq default-directory expanded-dir)
(pwd)))
;;((string-match "^set\\s +chatter\\s +\\([0-9]\\)+" input)
;; (setq twelf-chatter (string-to-int (looked-at-string input 1))))
;; (setq twelf-chatter (string-to-number (looked-at-string input 1))))
;; ((string-match "^set\\s +Trace\\.detail\\s +\\([0-9]\\)+" input)
;; (setq twelf-trace-detail (string-to-int (looked-at-string input 1))))
;; (setq twelf-trace-detail (string-to-number (looked-at-string input 1))))
((string-match "^set\\s-+\\(\\S-+\\)\\s-+\\(\\w+\\)" input)
(if (assoc (looked-at-string input 1) *twelf-track-parms*)
(set (cdr (assoc (looked-at-string input 1) *twelf-track-parms*))
Expand Down Expand Up @@ -2026,7 +2026,7 @@ Starts a Twelf servers if necessary."
(let ((input (read-string "Limit (* or nat): ")))
(if (equal input "*")
input
(let ((n (string-to-int input)))
(let ((n (string-to-number input)))
(if (and (integerp n) (> n 0))
(int-to-string n)
(error "Number must be non-negative integer"))))))
Expand Down