Mercurial > emacs
comparison lisp/calc/calc-forms.el @ 89909:68c22ea6027c
Sync to HEAD
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Fri, 16 Apr 2004 12:51:06 +0000 |
| parents | 375f2633d815 |
| children | cb7f41387eb3 |
comparison
equal
deleted
inserted
replaced
| 89908:ee1402f7b568 | 89909:68c22ea6027c |
|---|---|
| 1 ;;; calc-forms.el --- data format conversion functions for Calc | 1 ;;; calc-forms.el --- data format conversion functions for Calc |
| 2 | 2 |
| 3 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc. | 3 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2004 Free Software Foundation, Inc. |
| 4 | 4 |
| 5 ;; Author: David Gillespie <daveg@synaptics.com> | 5 ;; Author: David Gillespie <daveg@synaptics.com> |
| 6 ;; Maintainers: D. Goel <deego@gnufans.org> | 6 ;; Maintainers: D. Goel <deego@gnufans.org> |
| 7 ;; Colin Walters <walters@debian.org> | 7 ;; Colin Walters <walters@debian.org> |
| 8 | 8 |
| 210 (or new | 210 (or new |
| 211 (setq new (read-string (concat "From time zone: " old | 211 (setq new (read-string (concat "From time zone: " old |
| 212 ", to zone: ")))) | 212 ", to zone: ")))) |
| 213 (if (stringp old) (setq old (math-read-expr old))) | 213 (if (stringp old) (setq old (math-read-expr old))) |
| 214 (if (eq (car-safe old) 'error) | 214 (if (eq (car-safe old) 'error) |
| 215 (error "Error in expression: " (nth 1 old))) | 215 (error "Error in expression: %S" (nth 1 old))) |
| 216 (if (equal new "") (setq new "local")) | 216 (if (equal new "") (setq new "local")) |
| 217 (if (stringp new) (setq new (math-read-expr new))) | 217 (if (stringp new) (setq new (math-read-expr new))) |
| 218 (if (eq (car-safe new) 'error) | 218 (if (eq (car-safe new) 'error) |
| 219 (error "Error in expression: " (nth 1 new))) | 219 (error "Error in expression: %S" (nth 1 new))) |
| 220 (calc-enter-result 1 "tzcv" (list 'calcFunc-tzconv | 220 (calc-enter-result 1 "tzcv" (list 'calcFunc-tzconv |
| 221 (calc-top-n 1) old new))))) | 221 (calc-top-n 1) old new))))) |
| 222 | 222 |
| 223 (defun calc-new-week (arg) | 223 (defun calc-new-week (arg) |
| 224 (interactive "P") | 224 (interactive "P") |
| 1820 (throw 'syntax (nth 2 res))) | 1820 (throw 'syntax (nth 2 res))) |
| 1821 (setq exp-pos (1+ last)) | 1821 (setq exp-pos (1+ last)) |
| 1822 (math-read-token) | 1822 (math-read-token) |
| 1823 res)) | 1823 res)) |
| 1824 | 1824 |
| 1825 ;;; arch-tag: a3d8f33b-9508-4043-8060-d02b8c9c750c | |
| 1825 ;;; calc-forms.el ends here | 1826 ;;; calc-forms.el ends here |