Commit graph

73 commits

Author SHA1 Message Date
Tino Calancha
c48e539226 Use the expression angle units while simplifying it
Don't use the angle mode, use the angle units included
in the expression instead (Bug#23889).
* lisp/calc/calc-alg.el (calc-input-angle-units): New defun.
(math-simplify): Use it.
* lisp/calc/calc-forms.el (math-to-hms, math-from-hms):
Don't use calc-angle-mode if math-simplifying-units is non-nil.
* lisp/calc/calc-math.el (calcFunc-nroot, math-from-radians)
(math-to-radians-2, math-from-radians-2): Don't convert angle
to radians if math-simplifying-units is non-nil.
* test/lisp/calc/calc-tests.el (test-calc-23889): Add test.
2017-05-18 14:47:06 +09:00
Tino Calancha
eab1a6307b Revert "Ignore angle mode while simplifying units"
This reverts commit 713e922243.
This commit causes Bug#25652.
2017-05-18 13:15:50 +09:00
Paul Eggert
bcf244ef9b Merge from origin/emacs-25
2e2a806 Fix copyright years by hand
5badc81 Update copyright year to 2017
2017-01-01 01:10:47 -08:00
Paul Eggert
5badc81c1c Update copyright year to 2017
Run admin/update-copyright.
2016-12-31 19:42:26 -08:00
Tino Calancha
713e922243 Ignore angle mode while simplifying units
* lisp/calc/calc-forms.el (math-to-hms, math-from-hms):
Ignore value of 'calc-angle-mode' when 'math-simplifying-units'
is non-nil (Bug#23889).
* lisp/calc/calc-math.el (math-to-radians, math-from-radians)
(math-from-radians-2, math-to-radians-2): Idem.
2016-07-12 00:38:14 +09:00
Paul Eggert
0e963201d0 Update copyright year to 2016
Run admin/update-copyright.
2016-01-01 01:34:24 -08:00
Jay Belanger
fb711d7275 Change maintainer address.
* lisp/calc/calc (calc-bug-address): Change address.
2015-11-03 16:16:54 -06:00
Paul Eggert
5e63c84200 Fix minor text quoting in calc, calendar, vc
* lisp/calc/calc-ext.el (calc-shift-Z-prefix-help):
* lisp/calc/calc-help.el (calc-j-prefix-help):
* lisp/calc/calc-misc.el (calc-help):
* lisp/calc/calc.el (calc-algebraic-mode, calc-mode):
Escape an apostrophe in a docstring.
* lisp/calc/calc-forms.el (calc-hms-notation):
* lisp/calc/calc-mode.el (calc-display-raw, calc-algebraic-mode):
Escape an apostrophe in a diagnostic.
* lisp/calc/calc-misc.el (calc-help):
* lisp/calendar/diary-lib.el (diary-include-files):
* lisp/calendar/todo-mode.el (todo-prefix, todo-item-mark):
* lisp/vc/diff-mode.el (diff-delete-trailing-whitespace):
* lisp/vc/ediff-diff.el (ediff-same-contents):
* lisp/vc/ediff-merg.el (ediff-re-merge):
* lisp/vc/ediff-ptch.el (ediff-patch-file-internal):
* lisp/vc/ediff-util.el (ediff-test-save-region)
(ediff-status-info):
* lisp/vc/ediff.el (ediff-merge-revisions)
(ediff-merge-revisions-with-ancestor):
* lisp/vc/pcvs.el (cvs-mode-checkout, cvs-vc-command-advice):
* lisp/vc/vc-cvs.el (vc-cvs-mode-line-string):
Respect text quoting style in doc string or diagnostic.
* lisp/calc/calc-prog.el (calc-kbd-push, calc-kbd-pop):
* lisp/vc/add-log.el (change-log-goto-source):
Avoid double-formatting.
* lisp/vc/ediff-init.el (format-message):
New backward-compatibility alias.
2015-08-28 22:25:09 -07:00
Jay Belanger
e368697ce3 Fix description of Unix time, mention new function.
* lisp/calc/calc-forms.el (calcFunc-unixtime): Fix adjustment for
Unix time.
* doc/misc/calc.texi (Date Forms): Fix description of Unix time.
(Basic Operations on Units): Mention `calc-convert-exact-units'.
2015-04-09 19:03:19 -05:00
Paul Eggert
7e09ef09a4 Update copyright year to 2015
Run admin/update-copyright.
2015-01-01 14:26:41 -08:00
Jay Belanger
86e714105d calc/calc-forms.el (math-normalize-hms): Do a better check for
"negative" hms forms.
2014-09-04 20:04:47 -05:00
Paul Eggert
ba3189039a Update copyright year to 2014 by running admin/update-copyright. 2014-01-01 07:43:34 +00:00
Paul Eggert
0877d0dc24 Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca 2013-01-02 08:13:04 -08:00
Paul Eggert
ab422c4d68 Update copyright notices for 2013. 2013-01-01 09:11:05 +00:00
Jay Belanger
fd1f1603a4 * calc/calc-forms.el (math-parse-date): Try using
`math-parse-iso-date' when it looks like it might be needed.  Allow
times of 24:00. 
(math-parse-date-validate, math-parse-iso-date-validate):  Allow times
of 24:00.
2012-12-30 20:58:57 -06:00
Jay Belanger
8c21bef6d1 * lisp/calc/calc-forms.el (calc-date-notation): Fix typo. 2012-12-10 20:37:36 -06:00
Jay Belanger
ff3f6c266a * lisp/calc/calc.el (calc-standard-date-formats): Add more date
formats.

* lisp/calc/calc-forms.el (math-parse-iso-date): New function.
  (math-parse-date): Use `math-parse-iso-date' when appropriate.
  (math-parse-iso-date-validate): Add extra error checking.
  (calc-date-notation): Add ability to access new date formats.
2012-12-10 20:29:21 -06:00
Jay Belanger
77a7493589 * lisp/calc/calc-forms.el (math-date-to-iso-dt): Fix weekday number. 2012-12-02 22:46:49 -06:00
Jay Belanger
1bf3989cd4 * lisp/calc/calc-forms.el (math-date-to-iso-dt): Fix typo. 2012-12-02 19:05:08 -06:00
Jay Belanger
682ceaf895 * lisp/calc/calc-forms.el (math-absolute-from-iso-dt)
(math-date-to-iso-dt, math-parse-iso-date-validate)
(math-iso-dt-to-date): New functions.
(math-fd-iso-dt, math-fd-isoyear, math-fd-isoweek)
(math-fd-isoweekday): New variables.
(calc-date-notation, math-parse-standard-date, math-format-date)
(math-format-date-part): Add support for more formatting codes.
2012-12-02 18:54:11 -06:00
Jay Belanger
e7c8fcc44e * lisp/calc/calc-forms.el (calc-date-notation): Fix regexp
used to find time codes.  Fix symbol for seconds.
2012-11-27 22:51:13 -06:00
Jay Belanger
e8909bdc32 * calc/calc-forms.el (math-leap-year-p): Fix formula for negative
year numbers.
(math-date-to-julian-dt): Adjust the initial approximation for the
year to deal with the new definition of the DATE.
2012-11-18 23:03:08 -06:00
Jay Belanger
eef97f35c8 * calc/calc-forms.el (math-date-to-dt): Use integer date
when calling `math-date-to-julian-dt' and 'math-date-to-gregorian-dt'.
2012-11-17 21:59:00 -06:00
Paul Eggert
310e60d945 Calc now uses the Gregorian calendar for all dates,
and uses January 1, 1 AD as its day number 1.
* doc/misc/calc.texi (Date Forms): Document this.

* lisp/calc/calc-forms.el (math-julian-date-beginning)
(math-julian-date-beginning-int): Implement this.
2012-11-17 16:01:59 -06:00
Jay Belanger
3dc7dad23a * calc/calc-forms.el (calc-gregorian-switch): Declare. 2012-11-17 15:34:09 -06:00
Jay Belanger
c9f618db44 * calc/calc.el (calc-gregorian-switch): New variable.
* calc/calc-forms.el (math-day-in-year, math-dt-before-p)
(math-absolute-from-gregorian-dt, math-absolute-from-julian-dt)
(math-date-to-julian-dt, math-date-to-gregorian-dt): New functions.
(math-leap-year-p): Add option to distinguish between Julian 
and Gregorian calendars. 
(math-day-number): Use `math-day-in-year' to do the computations.
(math-absolute-from-dt): Rename from `math-absolute-from-date'.
Use `math-absolute-from-gregorian' and `math-absolute-from-julian' 
to do the computations.
(math-date-to-dt): Use `math-date-to-julian-dt' and `math-date-to-gregorian-dt' 
to do the computations.
(calcFunc-weekday, math-format-date-part): Use the new version of the DATE to
determine the weekday.
(calcFunc-newmonth, calcFunc-newyear): Use `calc-gregorian-switch' when necessary.
2012-11-17 15:30:43 -06:00
Chong Yidong
865fe16fd2 Update docstrings and comments to use "init file" terminology.
* bookmark.el (bookmark-bmenu-toggle-filenames): Doc fixes.
* comint.el (comint-prompt-read-only):
* custom.el (defcustom):
* hi-lock.el (hi-lock-mode):
* ibuffer.el (ibuffer-formats):
* ielm.el (ielm-prompt-read-only):
* novice.el (disable-command):
* saveplace.el (toggle-save-place):
* speedbar.el (speedbar-supported-extension-expressions):
* startup.el (auto-save-list-file-prefix, init-file-user)
(after-init-hook, inhibit-startup-echo-area-message):
* strokes.el (strokes-help):
* time-stamp.el (time-stamp):
* calendar/calendar.el (calendar, diary-file):
* calendar/diary-lib.el (diary-mail-entries, diary)
(diary-list-entries-hook):
* calendar/holidays.el (holidays, calendar-holidays):
* calendar/lunar.el (lunar-phases):
* calendar/solar.el (sunrise-sunset):
* emulation/edt.el (edt-load-keys):
* emulation/viper.el (viper-mode):
* eshell/em-alias.el (eshell-command-aliases-list):
* eshell/esh-util.el (eshell-convert-numeric-arguments):
* international/ogonek.el (ogonek-information):
* net/tramp-cmds.el (tramp-bug):
* net/quickurl.el (quickurl-reread-hook-postfix):
* play/decipher.el (decipher-font-lock-keywords):
* progmodes/cc-styles.el (c-set-style):
* progmodes/idlw-shell.el (idlwave-shell-prompt-pattern):
* progmodes/inf-lisp.el (inferior-lisp-prompt):
* progmodes/octave-mod.el (octave-mode):
* progmodes/sql.el (sql-mode, sql-interactive-mode, sql-password):
* progmodes/verilog-mode.el (verilog-read-defines):
* textmodes/two-column.el (2C-mode): Likewise.
2012-09-17 13:41:04 +08:00
Paul Eggert
0bfcf5c598 Fix minor Y10k bugs.
* lisp/arc-mode.el (archive-unixdate):
* lisp/autoinsert.el (auto-insert-alist):
* lisp/calc/calc-forms.el (math-this-year):
* lisp/gnus/nnweb.el (nnweb-google-parse-1):
* lisp/emacs-lisp/copyright.el (copyright-current-year)
(copyright-update-year, copyright):
* lisp/tar-mode.el (tar-clip-time-string):
* lisp/time.el (display-time-update):
Don't assume years have 4 digits.
2012-05-03 23:13:18 -07:00
Glenn Morris
acaf905b11 Add 2012 to FSF copyright years for Emacs files 2012-01-05 01:46:05 -08:00
Glenn Morris
73b0cd5003 Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
Glenn Morris
0d9f702fd0 Nuke arch-tags. 2011-01-15 15:16:57 -08:00
Glenn Morris
5df4f04cd3 Add 2011 to FSF/AIST copyright years. 2011-01-02 15:50:46 -08:00
Glenn Morris
114f9c9679 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
Jay Belanger
2d1c8c66dc (math-format-date): Fix typo. 2009-11-20 01:08:03 +00:00
Jay Belanger
d389fbcb3f (math-format-date): Let `calc-twos-complement-mode' be nil. 2009-11-20 00:58:00 +00:00
Jay Belanger
6292c59952 (calc-date-notation): Check to see if the format is whitespace
instead of only the empty string.
2009-11-02 02:59:23 +00:00
Glenn Morris
ae940284fa Add 2009 to copyright years. 2009-01-05 03:18:22 +00:00
Glenn Morris
662c9c64ae Switch to recommended form of GPLv3 permissions notice. 2008-05-06 03:16:00 +00:00
Stefan Monnier
cbee283dd7 Fix up comment convention on the arch-tag lines. 2008-04-10 14:10:46 +00:00
Miles Bader
59ce725a3b Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
2008-01-08 20:46:54 +00:00
Glenn Morris
8b72699e88 Add 2008 to copyright years. 2008-01-07 01:14:52 +00:00
Jay Belanger
1976223fab (calendar-current-time-zone)
(calendar-absolute-from-gregorian, dst-in-effect): Declare as
functions.
2007-11-27 04:04:08 +00:00
Jay Belanger
94a954954c (var-TimeZone): Make nil the default value.
(math-calendar-tzinfo): New variable.
(math-get-calendar-tzinfo): New function.
(calcFunc-tzone, calcFunc-dst): Use Emacs's calendar
to get information when zone is nil.
2007-08-25 01:37:13 +00:00
Miles Bader
9aecacd08a Merge from emacs--rel--22
Patches applied:

 * emacs--rel--22  (patch 70-73)

   - Update from CVS

2007-07-25  Glenn Morris  <rgm@gnu.org>

   * Relicense all FSF files to GPLv3 or later.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
2007-07-26 05:28:10 +00:00
Glenn Morris
075969b476 Switch license to GPLv3 or later. 2007-07-25 03:51:22 +00:00
Jay Belanger
98e9ffe31e (math-julian-date-beginning,math-julian-date-beginning-int) New constants.
(math-format-date-part,math-parse-standard-date,calcFunc-julian):
Use the new constants.
2007-07-08 00:00:30 +00:00
Jay Belanger
092c493633 (math-format-date-part,calc-parse-standard-date,calcFunc-julian):
Fix incorrect number used in calculations.
2007-06-22 15:05:08 +00:00
Jay Belanger
cebd3c8a27 *** empty log message *** 2007-06-22 06:02:50 +00:00
Jay Belanger
e5f1224e18 (math-format-date-part,math-parse-standard-date,calcFunc-julian):
Replace math-read-number-simple by math-read-number.
2007-06-22 05:52:29 +00:00
Jay Belanger
3b6d80bc94 (math-format-date-part,math-parse-standard-date,calcFunc-julian):
Use `math-read-number-simple' to insert bignums.
2007-06-22 04:09:00 +00:00