1 new commit in calendar: https://bitbucket.org/xemacs/calendar/commits/dc56f945b978/ Changeset: dc56f945b978 User: Jerry James Date: 2014-08-10 03:54:25 Summary: Remove workarounds for missing assoc-string. See xemacs-patches message <CAHCOHQk9m6pmDz9HSVoWdGZpvzVc6Y1gEk5m6UNF15b0VwGuDQ(a)mail.gmail.com&gt;. Affected #: 11 files diff -r dd6af4aede7f6cfe3e7be399dae1aa6faa73f735 -r dc56f945b97839c9c1cbfacd9877eb8e93b9f426 ChangeLog --- a/ChangeLog +++ b/ChangeLog ＠＠ -1,3 +1,22 ＠＠ +2014-08-04 Jerry James <james(a)xemacs.org&gt; + + * cal-compat.el (cal-assoc-string): Remove, since assoc-string is + now available in xemacs-base. + * cal-bahai.el (mark-bahai-diary-entries): Use assoc-string + instead of cal-assoc-string. + * cal-coptic.el (coptic-prompt-for-date): Ditto. + * cal-french.el (calendar-goto-french-date): Ditto. + * cal-hebrew.el (calendar-goto-hebrew-date): Ditto. + (mark-hebrew-diary-entries): Ditto. + (list-yahrzeit-dates): Ditto. + * cal-islam.el (calendar-goto-islamic-date): Ditto. + (mark-islamic-diary-entries): Ditto. + * cal-julian.el (calendar-goto-julian-date): Ditto. + * cal-mayan.el (calendar-read-mayan-haab-date): Ditto. + (calendar-read-mayan-tzolkin-date): Ditto. + * calendar.el (calendar-read-date): Ditto. + * diary-lib.el (mark-diary-entries): Ditto. + 2014-05-15 Norbert Koch <viteno(a)xemacs.org&gt; * Makefile (VERSION): XEmacs package 1.40 released. diff -r dd6af4aede7f6cfe3e7be399dae1aa6faa73f735 -r dc56f945b97839c9c1cbfacd9877eb8e93b9f426 cal-bahai.el --- a/cal-bahai.el +++ b/cal-bahai.el ＠＠ -387,8 +387,7 ＠＠ (string-to-number y-str))))) (if dd-name (mark-calendar-days-named - ;; XEmacs change, we don't have assoc-string - (cdr (cal-assoc-string (substring dd-name 0 3) + (cdr (assoc-string (substring dd-name 0 3) (calendar-make-alist calendar-day-name-array 0 ＠＠ -398,8 +397,7 ＠＠ (if (string-equal mm-name "*") (setq mm 0) (setq mm - ;; XEmacs change, we don't have assoc-string - (cdr (cal-assoc-string + (cdr (assoc-string mm-name (calendar-make-alist bahai-calendar-month-name-array) diff -r dd6af4aede7f6cfe3e7be399dae1aa6faa73f735 -r dc56f945b97839c9c1cbfacd9877eb8e93b9f426 cal-compat.el --- a/cal-compat.el +++ b/cal-compat.el ＠＠ -69,15 +69,6 ＠＠ (setq buffer-invisibility-spec (cons arg buffer-invisibility-spec)))) -;;;###autoload -(if (fboundp 'assoc-string) - (defalias 'cal-assoc-string 'assoc-string) - (defun cal-assoc-string (key list case-fold) - (if case-fold - (assoc-ignore-case key list) - (assoc key list))) - ) - ;; XEmacs change ;; not available until 21.5 ;;;###autoload diff -r dd6af4aede7f6cfe3e7be399dae1aa6faa73f735 -r dc56f945b97839c9c1cbfacd9877eb8e93b9f426 cal-coptic.el --- a/cal-coptic.el +++ b/cal-coptic.el ＠＠ -157,8 +157,7 ＠＠ (calendar-coptic-from-absolute (calendar-absolute-from-gregorian today)))))) (completion-ignore-case t) - ;; XEmacs change, we don't have assoc-string - (month (cdr (cal-assoc-string + (month (cdr (assoc-string (completing-read (format "%s calendar month name: " coptic-name) (mapcar 'list diff -r dd6af4aede7f6cfe3e7be399dae1aa6faa73f735 -r dc56f945b97839c9c1cbfacd9877eb8e93b9f426 cal-french.el --- a/cal-french.el +++ b/cal-french.el ＠＠ -235,8 +235,7 ＠＠ (concat "Jour " x)) special-days)))))))) (completion-ignore-case t) - ;; XEmacs change, we don't have assoc-string - (month (cdr (cal-assoc-string + (month (cdr (assoc-string (completing-read "Mois ou Sansculottide: " month-list diff -r dd6af4aede7f6cfe3e7be399dae1aa6faa73f735 -r dc56f945b97839c9c1cbfacd9877eb8e93b9f426 cal-hebrew.el --- a/cal-hebrew.el +++ b/cal-hebrew.el ＠＠ -244,16 +244,14 ＠＠ calendar-hebrew-month-name-array-leap-year calendar-hebrew-month-name-array-common-year)) (completion-ignore-case t) - ;; XEmacs change, we don't have assoc-string - (month (cdr (cal-assoc-string + (month (cdr (assoc-string (completing-read "Hebrew calendar month name: " (mapcar 'list (append month-array nil)) (if (= year 3761) '(lambda (x) (let ((m (cdr - ;; XEmacs change, we don't have assoc-string - (cal-assoc-string + (assoc-string (car x) (calendar-make-alist month-array) t)))) ＠＠ -763,17 +761,15 ＠＠ (string-to-number y-str))))) (if dd-name (mark-calendar-days-named - ;; XEmacs change, we don't have assoc-string - (cdr (cal-assoc-string dd-name - (calendar-make-alist - calendar-day-name-array - 0 nil calendar-day-abbrev-array) t))) + (cdr (assoc-string dd-name + (calendar-make-alist + calendar-day-name-array + 0 nil calendar-day-abbrev-array) t))) (if mm-name (setq mm (if (string-equal mm-name "*") 0 (cdr - ;; XEmacs change, we don't have assoc-string - (cal-assoc-string + (assoc-string mm-name (calendar-make-alist calendar-hebrew-month-name-array-leap-year) t))))) ＠＠ -851,8 +847,7 ＠＠ (int-to-string (extract-calendar-year today)))) (month-array calendar-month-name-array) (completion-ignore-case t) - ;; XEmacs change, we don't have assoc-string - (month (cdr (cal-assoc-string + (month (cdr (assoc-string (completing-read "Month of death (name): " (mapcar 'list (append month-array nil)) diff -r dd6af4aede7f6cfe3e7be399dae1aa6faa73f735 -r dc56f945b97839c9c1cbfacd9877eb8e93b9f426 cal-islam.el --- a/cal-islam.el +++ b/cal-islam.el ＠＠ -161,8 +161,7 ＠＠ (calendar-absolute-from-gregorian today)))))) (month-array calendar-islamic-month-name-array) (completion-ignore-case t) - ;; XEmacs change, we don't have assoc-string - (month (cdr (cal-assoc-string + (month (cdr (assoc-string (completing-read "Islamic calendar month name: " (mapcar 'list (append month-array nil)) ＠＠ -380,15 +379,13 ＠＠ (string-to-number y-str))))) (if dd-name (mark-calendar-days-named - ;; XEmacs change, we don't have assoc-string - (cdr (cal-assoc-string dd-name - (calendar-make-alist - calendar-day-name-array - 0 nil calendar-day-abbrev-array) t))) + (cdr (assoc-string dd-name + (calendar-make-alist + calendar-day-name-array + 0 nil calendar-day-abbrev-array) t))) (if mm-name (setq mm (if (string-equal mm-name "*") 0 - ;; XEmacs change, we don't have assoc-string - (cdr (cal-assoc-string + (cdr (assoc-string mm-name (calendar-make-alist calendar-islamic-month-name-array) t))))) diff -r dd6af4aede7f6cfe3e7be399dae1aa6faa73f735 -r dc56f945b97839c9c1cbfacd9877eb8e93b9f426 cal-julian.el --- a/cal-julian.el +++ b/cal-julian.el ＠＠ -120,8 +120,7 ＠＠ today)))))) (month-array calendar-month-name-array) (completion-ignore-case t) - ;; XEmacs change, we don't have assoc-string - (month (cdr (cal-assoc-string + (month (cdr (assoc-string (completing-read "Julian calendar month name: " (mapcar 'list (append month-array nil)) diff -r dd6af4aede7f6cfe3e7be399dae1aa6faa73f735 -r dc56f945b97839c9c1cbfacd9877eb8e93b9f426 cal-mayan.el --- a/cal-mayan.el +++ b/cal-mayan.el ＠＠ -262,8 +262,7 ＠＠ (haab-month-list (append calendar-mayan-haab-month-name-array (and (< haab-day 5) '("Uayeb")))) (haab-month (cdr - ;; XEmacs change, we don't have assoc-string - (cal-assoc-string + (assoc-string (completing-read "Haab uinal: " (mapcar 'list haab-month-list) nil t) ＠＠ -278,8 +277,7 ＠＠ '(lambda (x) (and (> x 0) (< x 14))))) (tzolkin-name-list (append calendar-mayan-tzolkin-names-array nil)) (tzolkin-name (cdr - ;; XEmacs change, we don't have assoc-string - (cal-assoc-string + (assoc-string (completing-read "Tzolkin uinal: " (mapcar 'list tzolkin-name-list) nil t) diff -r dd6af4aede7f6cfe3e7be399dae1aa6faa73f735 -r dc56f945b97839c9c1cbfacd9877eb8e93b9f426 calendar.el --- a/calendar.el +++ b/calendar.el ＠＠ -2782,8 +2782,7 ＠＠ (calendar-current-date))))) (month-array calendar-month-name-array) (completion-ignore-case t) - ;; XEmacs change, we don't have assoc-string - (month (cdr (cal-assoc-string + (month (cdr (assoc-string (completing-read "Month name: " (mapcar 'list (append month-array nil)) diff -r dd6af4aede7f6cfe3e7be399dae1aa6faa73f735 -r dc56f945b97839c9c1cbfacd9877eb8e93b9f426 diary-lib.el --- a/diary-lib.el +++ b/diary-lib.el ＠＠ -1055,8 +1055,7 ＠＠ marks (nth 1 tmp))) (if dd-name (mark-calendar-days-named - ;; XEmacs change, we don't have assoc-string - (cdr (cal-assoc-string + (cdr (assoc-string dd-name (calendar-make-alist calendar-day-name-array ＠＠ -1064,8 +1063,7 ＠＠ (if mm-name (setq mm (if (string-equal mm-name "*") 0 - ;; XEmacs change, we don't have assoc-string - (cdr (cal-assoc-string + (cdr (assoc-string mm-name (calendar-make-alist calendar-month-name-array Repository URL: https://bitbucket.org/xemacs/calendar/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches