From d92bcf94ecd8ab89f561950bd4d9d8f25dbdeaeb Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 8 Apr 2008 07:08:24 +0000 Subject: [PATCH] Replace int-to-string with number-to-string. --- lisp/ChangeLog | 27 +++++++++++++++++++++++++++ lisp/calendar/cal-bahai.el | 8 ++++---- lisp/calendar/cal-china.el | 8 ++++---- lisp/calendar/cal-coptic.el | 8 ++++---- lisp/calendar/cal-french.el | 2 +- lisp/calendar/cal-hebrew.el | 6 +++--- lisp/calendar/cal-islam.el | 2 +- lisp/calendar/cal-iso.el | 2 +- lisp/calendar/cal-julian.el | 4 ++-- lisp/calendar/cal-move.el | 2 +- lisp/calendar/cal-persia.el | 8 ++++---- lisp/calendar/cal-tex.el | 12 ++++++------ lisp/calendar/calendar.el | 8 ++++---- lisp/calendar/holidays.el | 7 +++++-- 14 files changed, 67 insertions(+), 37 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0a30650c48b..beb9fe71e39 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,30 @@ +2008-04-08 Glenn Morris + + * calendar/cal-menu.el (cal-menu-event-to-date): + Rename calendar-event-to-date. Update callers. + (calendar-mouse-tex-day): Rename cal-tex-mouse-day. + (calendar-mouse-tex-week): Rename cal-tex-mouse-week. + (calendar-mouse-tex-week2): Rename cal-tex-mouse-week2. + (calendar-mouse-tex-week-iso): Rename cal-tex-mouse-week-iso. + (calendar-mouse-tex-week-monday): Rename cal-tex-mouse-week-monday. + (calendar-mouse-tex-filofax-daily): Rename cal-tex-mouse-filofax-daily. + (calendar-mouse-tex-filofax-2week): Rename cal-tex-mouse-filofax-2week. + (calendar-mouse-tex-filofax-week): Rename cal-tex-mouse-filofax-week. + (calendar-mouse-tex-month): Rename cal-tex-mouse-month. + (calendar-mouse-tex-month-landscape): + Rename cal-tex-mouse-month-landscape. + (calendar-mouse-tex-year): Rename cal-tex-mouse-year. + (calendar-mouse-tex-filofax-year): Rename cal-tex-mouse-filofax-year. + (calendar-mouse-tex-year-landscape): + Rename cal-tex-mouse-year-landscape. + (cal-menu-context-mouse-menu): Update for above name changes. + + * calendar/cal-bahai.el, calendar/cal-china.el, calendar/cal-coptic.el: + * calendar/cal-french.el, calendar/cal-hebrew.el, calendar/cal-islam.el: + * calendar/cal-iso.el, calendar/cal-julian.el, calendar/cal-move.el: + * calendar/cal-persia.el, calendar/cal-tex.el, calendar/calendar.el: + * calendar/holidays.el: Replace int-to-string with number-to-string. + 2008-04-08 Chong Yidong * mwheel.el (mwheel-scroll): Deactivate any temporarily active diff --git a/lisp/calendar/cal-bahai.el b/lisp/calendar/cal-bahai.el index 4e9d2970558..4726c0b9c47 100644 --- a/lisp/calendar/cal-bahai.el +++ b/lisp/calendar/cal-bahai.el @@ -135,12 +135,12 @@ Defaults to today's date if DATE is not given." (<= d 0)) "Ayyám-i-Há" (aref calendar-bahai-month-name-array (1- m)))) - (day (int-to-string + (day (number-to-string (if (<= d 0) (+ d (if (calendar-bahai-leap-year-p y) 5 4)) d))) - (year (int-to-string y)) - (month (int-to-string m)) + (year (number-to-string y)) + (month (number-to-string m)) dayname) ;; Can't call calendar-date-string because of monthname oddity. (mapconcat 'eval calendar-date-display-form ""))))) @@ -164,7 +164,7 @@ Reads a year, month and day." (year (calendar-read "Bahá'í calendar year (not 0): " (lambda (x) (not (zerop x))) - (int-to-string + (number-to-string (calendar-extract-year (calendar-bahai-from-absolute (calendar-absolute-from-gregorian today)))))) diff --git a/lisp/calendar/cal-china.el b/lisp/calendar/cal-china.el index 5590963b083..9ff392c47ee 100644 --- a/lisp/calendar/cal-china.el +++ b/lisp/calendar/cal-china.el @@ -537,9 +537,9 @@ Defaults to today's date if DATE is not given." (cons (format "%s (second)" (car l)) (cadr l))) (calendar-chinese-months-to-alist (cddr l))) (append - (list (cons (int-to-string (car l)) (car l))) + (list (cons (number-to-string (car l)) (car l))) (calendar-chinese-months-to-alist (cdr l)))) - (list (cons (int-to-string (car l)) (car l)))))) + (list (cons (number-to-string (car l)) (car l)))))) (defun calendar-chinese-months (c y) "A list of the months in cycle C, year Y of the Chinese calendar." @@ -569,11 +569,11 @@ Echo Chinese date unless NOECHO is non-nil." (cycle (calendar-read "Chinese calendar cycle number (>44): " (lambda (x) (> x 44)) - (int-to-string (car c)))) + (number-to-string (car c)))) (year (calendar-read "Year in Chinese cycle (1..60): " (lambda (x) (and (<= 1 x) (<= x 60))) - (int-to-string (cadr c)))) + (number-to-string (cadr c)))) (month-list (calendar-chinese-months-to-alist (calendar-chinese-months cycle year))) (month (cdr (assoc diff --git a/lisp/calendar/cal-coptic.el b/lisp/calendar/cal-coptic.el index 6d301e0bce1..f2964c58ee8 100644 --- a/lisp/calendar/cal-coptic.el +++ b/lisp/calendar/cal-coptic.el @@ -122,10 +122,10 @@ Defaults to today's date if DATE is not given." (if (< y 1) "" (let ((monthname (aref calendar-coptic-month-name-array (1- m))) - (day (int-to-string (calendar-extract-day coptic-date))) + (day (number-to-string (calendar-extract-day coptic-date))) (dayname nil) - (month (int-to-string m)) - (year (int-to-string y))) + (month (number-to-string m)) + (year (number-to-string y))) (mapconcat 'eval calendar-date-display-form ""))))) ;;;###cal-autoload @@ -147,7 +147,7 @@ Reads a year, month, and day." (year (calendar-read (format "%s calendar year (>0): " calendar-coptic-name) (lambda (x) (> x 0)) - (int-to-string + (number-to-string (calendar-extract-year (calendar-coptic-from-absolute (calendar-absolute-from-gregorian today)))))) diff --git a/lisp/calendar/cal-french.el b/lisp/calendar/cal-french.el index e337ffc81da..322e60f4a3a 100644 --- a/lisp/calendar/cal-french.el +++ b/lisp/calendar/cal-french.el @@ -213,7 +213,7 @@ Echo French Revolutionary date unless NOECHO is non-nil." "Année de la Révolution (>0): " "Anne'e de la Re'volution (>0): ") (lambda (x) (> x 0)) - (int-to-string + (number-to-string (calendar-extract-year (calendar-french-from-absolute (calendar-absolute-from-gregorian diff --git a/lisp/calendar/cal-hebrew.el b/lisp/calendar/cal-hebrew.el index f51c8fae6db..bf4c3929fc1 100644 --- a/lisp/calendar/cal-hebrew.el +++ b/lisp/calendar/cal-hebrew.el @@ -242,7 +242,7 @@ Reads a year, month, and day." (year (calendar-read "Hebrew calendar year (>3760): " (lambda (x) (> x 3760)) - (int-to-string + (number-to-string (calendar-extract-year (calendar-hebrew-from-absolute (calendar-absolute-from-gregorian today)))))) @@ -738,7 +738,7 @@ from the cursor position." (year (calendar-read "Year of death (>0): " (lambda (x) (> x 0)) - (int-to-string (calendar-extract-year today)))) + (number-to-string (calendar-extract-year today)))) (month-array calendar-month-name-array) (completion-ignore-case t) (month (cdr (assoc-string @@ -757,7 +757,7 @@ from the cursor position." (format "Starting year of Yahrzeit table (>%d): " death-year) (lambda (x) (> x death-year)) - (int-to-string (1+ death-year)))) + (number-to-string (1+ death-year)))) (end-year (calendar-read (format "Ending year of Yahrzeit table (>=%d): " start-year) diff --git a/lisp/calendar/cal-islam.el b/lisp/calendar/cal-islam.el index e88aa3c04d5..ed0a8ff083c 100644 --- a/lisp/calendar/cal-islam.el +++ b/lisp/calendar/cal-islam.el @@ -153,7 +153,7 @@ Reads a year, month, and day." (year (calendar-read "Islamic calendar year (>0): " (lambda (x) (> x 0)) - (int-to-string + (number-to-string (calendar-extract-year (calendar-islamic-from-absolute (calendar-absolute-from-gregorian today)))))) diff --git a/lisp/calendar/cal-iso.el b/lisp/calendar/cal-iso.el index 1938ed9178f..efbcd30401f 100644 --- a/lisp/calendar/cal-iso.el +++ b/lisp/calendar/cal-iso.el @@ -102,7 +102,7 @@ taken to be 1)." (let* ((year (calendar-read "ISO calendar year (>0): " (lambda (x) (> x 0)) - (int-to-string (calendar-extract-year + (number-to-string (calendar-extract-year (calendar-current-date))))) (no-weeks (calendar-extract-month (calendar-iso-from-absolute diff --git a/lisp/calendar/cal-julian.el b/lisp/calendar/cal-julian.el index dcfca5efc04..55757daa467 100644 --- a/lisp/calendar/cal-julian.el +++ b/lisp/calendar/cal-julian.el @@ -106,7 +106,7 @@ Driven by the variable `calendar-date-display-form'." (year (calendar-read "Julian calendar year (>0): " (lambda (x) (> x 0)) - (int-to-string + (number-to-string (calendar-extract-year (calendar-julian-from-absolute (calendar-absolute-from-gregorian @@ -170,7 +170,7 @@ nil if it is not visible in the current calendar window." (defun calendar-astro-date-string (&optional date) "String of astronomical (Julian) day number after noon UTC of Gregorian DATE. Defaults to today's date if DATE is not given." - (int-to-string + (number-to-string (ceiling (calendar-astro-from-absolute (calendar-absolute-from-gregorian (or date (calendar-current-date))))))) diff --git a/lisp/calendar/cal-move.el b/lisp/calendar/cal-move.el index ba0e8ee8b8d..cd59ed7ff28 100644 --- a/lisp/calendar/cal-move.el +++ b/lisp/calendar/cal-move.el @@ -365,7 +365,7 @@ Negative DAY counts backward from end of year." (let* ((year (calendar-read "Year (>0): " (lambda (x) (> x 0)) - (int-to-string (calendar-extract-year + (number-to-string (calendar-extract-year (calendar-current-date))))) (last (if (calendar-leap-year-p year) 366 365)) (day (calendar-read diff --git a/lisp/calendar/cal-persia.el b/lisp/calendar/cal-persia.el index 3723157a8b0..316ff3a38a8 100644 --- a/lisp/calendar/cal-persia.el +++ b/lisp/calendar/cal-persia.el @@ -152,9 +152,9 @@ Gregorian date Sunday, December 31, 1 BC." (y (calendar-extract-year persian-date)) (m (calendar-extract-month persian-date)) (monthname (aref calendar-persian-month-name-array (1- m))) - (day (int-to-string (calendar-extract-day persian-date))) - (year (int-to-string y)) - (month (int-to-string m)) + (day (number-to-string (calendar-extract-day persian-date))) + (year (number-to-string y)) + (month (number-to-string m)) dayname) (mapconcat 'eval calendar-date-display-form ""))) @@ -174,7 +174,7 @@ Reads a year, month, and day." (let* ((year (calendar-read "Persian calendar year (not 0): " (lambda (x) (not (zerop x))) - (int-to-string + (number-to-string (calendar-extract-year (calendar-persian-from-absolute (calendar-absolute-from-gregorian diff --git a/lisp/calendar/cal-tex.el b/lisp/calendar/cal-tex.el index 51da0b8324e..c75231e4ace 100644 --- a/lisp/calendar/cal-tex.el +++ b/lisp/calendar/cal-tex.el @@ -1102,7 +1102,7 @@ The calendar shows holiday and diary entries if (insert "\\rightday") (insert "\\leftday")) (cal-tex-arg (cal-tex-LaTeXify-string (calendar-day-name date))) - (cal-tex-arg (int-to-string (calendar-extract-day date))) + (cal-tex-arg (number-to-string (calendar-extract-day date))) (cal-tex-arg (cal-tex-latexify-list diary-list date)) (cal-tex-arg (cal-tex-latexify-list holidays date)) (cal-tex-arg (eval cal-tex-daily-string)) @@ -1202,7 +1202,7 @@ if `cal-tex-holidays' and `cal-tex-diary', respectively, are non-nil." (dotimes (jdummy 3) (insert "\\leftday") (cal-tex-arg (cal-tex-LaTeXify-string (calendar-day-name date))) - (cal-tex-arg (int-to-string (calendar-extract-day date))) + (cal-tex-arg (number-to-string (calendar-extract-day date))) (cal-tex-arg (cal-tex-latexify-list diary-list date)) (cal-tex-arg (cal-tex-latexify-list holidays date)) (cal-tex-arg (eval cal-tex-daily-string)) @@ -1233,7 +1233,7 @@ if `cal-tex-holidays' and `cal-tex-diary', respectively, are non-nil." (dotimes (jdummy 2) (insert "\\rightday") (cal-tex-arg (cal-tex-LaTeXify-string (calendar-day-name date))) - (cal-tex-arg (int-to-string (calendar-extract-day date))) + (cal-tex-arg (number-to-string (calendar-extract-day date))) (cal-tex-arg (cal-tex-latexify-list diary-list date)) (cal-tex-arg (cal-tex-latexify-list holidays date)) (cal-tex-arg (eval cal-tex-daily-string)) @@ -1242,7 +1242,7 @@ if `cal-tex-holidays' and `cal-tex-diary', respectively, are non-nil." (dotimes (jdummy 2) (insert "\\weekend") (cal-tex-arg (cal-tex-LaTeXify-string (calendar-day-name date))) - (cal-tex-arg (int-to-string (calendar-extract-day date))) + (cal-tex-arg (number-to-string (calendar-extract-day date))) (cal-tex-arg (cal-tex-latexify-list diary-list date)) (cal-tex-arg (cal-tex-latexify-list holidays date)) (cal-tex-arg (eval cal-tex-daily-string)) @@ -1488,7 +1488,7 @@ Optional string COLSEP gives the column separation (default \"1mm\")." "\\multicolumn{7}{c}{" (cal-tex-month-name month) " " - (int-to-string year) + (number-to-string year) "}\\\\[1mm]\n"))) (dotimes (i 7) (setq str @@ -1504,7 +1504,7 @@ Optional string COLSEP gives the column separation (default \"1mm\")." (dotimes (idummy blank-days) (setq str (concat str " & "))) (dotimes (i last) - (setq str (concat str (int-to-string (1+ i))) + (setq str (concat str (number-to-string (1+ i))) str (concat str (if (zerop (mod (+ i 1 blank-days) 7)) (if (= i (1- last)) "" diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index 8e8942feeea..fd2ac255498 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -2258,7 +2258,7 @@ If optional NODAY is t, does not ask for day, but just returns (let* ((year (calendar-read "Year (>0): " (lambda (x) (> x 0)) - (int-to-string (calendar-extract-year + (number-to-string (calendar-extract-year (calendar-current-date))))) (month-array calendar-month-name-array) (completion-ignore-case t) @@ -2536,9 +2536,9 @@ name of the day of the week." (let* ((dayname (unless nodayname (calendar-day-name date abbreviate))) (month (calendar-extract-month date)) (monthname (calendar-month-name month abbreviate)) - (day (int-to-string (calendar-extract-day date))) - (month (int-to-string month)) - (year (int-to-string (calendar-extract-year date)))) + (day (number-to-string (calendar-extract-day date))) + (month (number-to-string month)) + (year (number-to-string (calendar-extract-year date)))) (mapconcat 'eval calendar-date-display-form ""))) (defun calendar-dayname-on-or-before (dayname date) diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el index b2fc745c143..dd3f5d50ffc 100644 --- a/lisp/calendar/holidays.el +++ b/lisp/calendar/holidays.el @@ -33,6 +33,7 @@ (require 'calendar) (require 'hol-loaddefs) +;; FIXME name that makes sense ;;;###diary-autoload (defun calendar-holiday-list () "Form the list of holidays that occur on dates in the calendar window. @@ -54,6 +55,7 @@ The holidays are those in the list `calendar-holidays'." (defvar displayed-month) ; from calendar-generate (defvar displayed-year) +;; FIXME name that makes sense ;;;###cal-autoload (defun calendar-list-holidays () "Create a buffer containing the holidays for the current calendar window. @@ -128,13 +130,13 @@ The optional LABEL is used to label the buffer created." (let* ((start-year (calendar-read "Starting year of holidays (>0): " (lambda (x) (> x 0)) - (int-to-string (calendar-extract-year + (number-to-string (calendar-extract-year (calendar-current-date))))) (end-year (calendar-read (format "Ending year (inclusive) of holidays (>=%s): " start-year) (lambda (x) (>= x start-year)) - (int-to-string start-year))) + (number-to-string start-year))) (completion-ignore-case t) (lists (list @@ -235,6 +237,7 @@ The holidays are those in the list `calendar-holidays'." (insert (mapconcat 'identity holiday-list "\n"))) (message "Checking holidays...done"))))) +;; FIXME move to calendar? ;;;###cal-autoload (defun calendar-mark-holidays () "Mark notable days in the calendar window." -- 2.11.4.GIT