Mercurial > emacs
annotate lisp/calendar/cal-iso.el @ 110523:a5ad4f188e19
Synch Semantic to CEDET 1.0.
Move CEDET ChangeLog entries to new file lisp/cedet/ChangeLog.
* semantic.el (semantic-version): Update to 2.0.
(semantic-mode-map): Add "," and "m" bindings.
(navigate-menu): Update.
* semantic/symref.el (semantic-symref-calculate-rootdir):
New function.
(semantic-symref-detect-symref-tool): Use it.
* semantic/symref/grep.el (semantic-symref-grep-shell): New var.
(semantic-symref-perform-search): Use it. Calculate root dir with
semantic-symref-calculate-rootdir.
(semantic-symref-derive-find-filepatterns): Improve error message.
* semantic/symref/list.el
(semantic-symref-results-mode-map): New bindings.
(semantic-symref-auto-expand-results): New option.
(semantic-symref-results-dump): Obey auto-expand.
(semantic-symref-list-expand-all, semantic-symref-regexp)
(semantic-symref-list-contract-all)
(semantic-symref-list-map-open-hits)
(semantic-symref-list-update-open-hits)
(semantic-symref-list-create-macro-on-open-hit)
(semantic-symref-list-call-macro-on-open-hits): New functions.
(semantic-symref-list-menu-entries)
(semantic-symref-list-menu): New vars.
(semantic-symref-list-map-open-hits): Move cursor to beginning of
match before calling the mapped function.
* semantic/doc.el
(semantic-documentation-comment-preceeding-tag): Do nothing if the
mode doesn't provide comment-start-skip.
* semantic/scope.el
(semantic-analyze-scope-nested-tags-default): Strip duplicates.
(semantic-analyze-scoped-inherited-tag-map): Take the tag we are
looking for as part of the scoped tags list.
* semantic/html.el (semantic-default-html-setup): Add
senator-step-at-tag-classes.
* semantic/decorate/include.el
(semantic-decoration-on-unknown-includes): Change light bgcolor.
(semantic-decoration-on-includes-highlight-default): Check that
the include tag has a postion.
* semantic/complete.el (semantic-collector-local-members):
(semantic-complete-read-tag-local-members)
(semantic-complete-jump-local-members): New class and functions.
(semantic-complete-self-insert): Save excursion before completing.
* semantic/analyze/complete.el
(semantic-analyze-possible-completions-default): If no completions
are found, return the raw by-name-only completion list. Add FLAGS
arguments. Add support for 'no-tc (type constraint) and
'no-unique, or no stripping duplicates.
(semantic-analyze-possible-completions-default): Add FLAGS arg.
* semantic/util-modes.el
(semantic-stickyfunc-show-only-functions-p): New option.
(semantic-stickyfunc-fetch-stickyline): Don't show stickytext for
the very first line in a buffer.
* semantic/util.el (semantic-hack-search)
(semantic-recursive-find-nonterminal-by-name)
(semantic-current-tag-interactive): Deleted.
(semantic-describe-buffer): Fix expand-nonterminal. Add
lex-syntax-mods, type relation separator char, and command
separation char.
(semantic-sanity-check): Only message if called interactively.
* semantic/tag.el (semantic-tag-deep-copy-one-tag): Copy the
:filename property and the tag position.
* semantic/lex-spp.el (semantic-lex-spp-lex-text-string):
Add recursion limit.
* semantic/imenu.el (semantic-imenu-bucketize-type-members):
Make this buffer local, not the obsoleted variable.
* semantic/idle.el: Add breadcrumbs support.
(semantic-idle-summary-current-symbol-info-default)
(semantic-idle-tag-highlight)
(semantic-idle-completion-list-default): Use
semanticdb-without-unloaded-file-searches for speed, and to
conform to the controls that specify if the idle timer is supposed
to be parsing unparsed includes.
(semantic-idle-symbol-highlight-face)
(semantic-idle-symbol-maybe-highlight): Rename from *-summary-*.
Callers changed.
(semantic-idle-work-parse-neighboring-files-flag): Default to nil.
(semantic-idle-work-update-headers-flag): New var.
(semantic-idle-work-for-one-buffer): Use it.
(semantic-idle-local-symbol-highlight): Rename from
semantic-idle-tag-highlight.
(semantic-idle-truncate-long-summaries): New option.
* semantic/ia.el (semantic-ia-cache)
(semantic-ia-get-completions): Deleted. Callers changed.
(semantic-ia-show-variants): New command.
(semantic-ia-show-doc): If doc is empty, don't make a temp buffer.
(semantic-ia-show-summary): If there isn't anything to show, say so.
* semantic/grammar.el (semantic-grammar-create-package):
Save the buffer even in batch mode.
* semantic/fw.el
(semanticdb-without-unloaded-file-searches): New macro.
* semantic/dep.el (semantic-dependency-find-file-on-path):
Fix case dereferencing ede-object when it is a list.
* semantic/db-typecache.el (semanticdb-expand-nested-tag)
(semanticdb-typecache-faux-namespace): New functions.
(semanticdb-typecache-file-tags)
(semanticdb-typecache-merge-streams): Use them.
(semanticdb-typecache-file-tags): When deriving tags from a file,
give the mode a chance to monkey with the tag copy.
(semanticdb-typecache-find-default): Wrap find in save-excursion.
(semanticdb-typecache-find-by-name-helper): Merge found names down.
* semantic/db-global.el
(semanticdb-enable-gnu-global-in-buffer): Don't show messages if
GNU Global is not available and we don't want to throw an error.
* semantic/db-find.el (semanticdb-find-result-nth-in-buffer):
When trying to normalize the tag to a buffer, don't error if
set-buffer method doesn't exist.
* semantic/db-file.el (semanticdb-save-db): Simplify msg.
* semantic/db.el (semanticdb-refresh-table): If forcing a
refresh on a file not in a buffer, use semantic-find-file-noselect
and delete the buffer after use.
(semanticdb-current-database-list): When calculating root via
hooks, force it through true-filename and skip the list of
possible roots.
* semantic/ctxt.el (semantic-ctxt-imported-packages): New.
* semantic/analyze/debug.el
(semantic-analyzer-debug-insert-tag): Reset standard output to
current buffer.
(semantic-analyzer-debug-global-symbol)
(semantic-analyzer-debug-missing-innertype): Change "prefix" to
"symbol" in messages.
* semantic/analyze/refs.el: (semantic-analyze-refs-impl)
(semantic-analyze-refs-proto): When calculating value, make sure
the found tag is 'similar' to the originating tag.
(semantic--analyze-refs-find-tags-with-parent): Attempt to
identify matches via imported symbols of parents.
(semantic--analyze-refs-full-lookup-with-parents): Do a deep
search during the brute search.
* semantic/analyze.el
(semantic-analyze-find-tag-sequence-default): Be robust to
calculated scopes being nil.
* semantic/bovine/c.el (semantic-c-describe-environment): Add
project macro symbol array.
(semantic-c-parse-lexical-token): Add recursion limit.
(semantic-ctxt-imported-packages, semanticdb-expand-nested-tag):
New overrides.
(semantic-expand-c-tag-namelist): Split a full type from a typedef
out to its own tag.
(semantic-expand-c-tag-namelist): Do not split out a typedef'd
inline type if it is an anonymous type.
(semantic-c-reconstitute-token): Use the optional initializers as
a clue that some function is probably a constructor. When
defining the type of these constructors, split the parent name,
and use only the class part, if applicable.
* semantic/bovine/c-by.el:
* semantic/wisent/python-wy.el: Regenerate.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Sat, 18 Sep 2010 22:49:54 -0400 |
parents | 1d1d5d9bd884 |
children | 280c8ae2476d 376148b31b5e |
rev | line source |
---|---|
38422
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
20462
diff
changeset
|
1 ;;; cal-iso.el --- calendar functions for the ISO calendar |
13053 | 2 |
92609 | 3 ;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
106815 | 4 ;; 2008, 2009, 2010 Free Software Foundation, Inc. |
13053 | 5 |
6 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> | |
65919
5c09efcfc1d9
Update maintainer email address.
Glenn Morris <rgm@gnu.org>
parents:
65145
diff
changeset
|
7 ;; Maintainer: Glenn Morris <rgm@gnu.org> |
13053 | 8 ;; Keywords: calendar |
9 ;; Human-Keywords: ISO calendar, calendar, diary | |
10 | |
11 ;; This file is part of GNU Emacs. | |
12 | |
94653
e49abd957e81
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
13 ;; GNU Emacs is free software: you can redistribute it and/or modify |
13053 | 14 ;; it under the terms of the GNU General Public License as published by |
94653
e49abd957e81
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
15 ;; the Free Software Foundation, either version 3 of the License, or |
e49abd957e81
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
16 ;; (at your option) any later version. |
13053 | 17 |
18 ;; GNU Emacs is distributed in the hope that it will be useful, | |
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
21 ;; GNU General Public License for more details. | |
22 | |
23 ;; You should have received a copy of the GNU General Public License | |
94653
e49abd957e81
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
24 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
13053 | 25 |
26 ;;; Commentary: | |
27 | |
93481
b3e69c64ac95
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93185
diff
changeset
|
28 ;; See calendar.el. |
20462
d179de7ad92e
Add reference to new Calendrical Calculations book.
Paul Eggert <eggert@twinsun.com>
parents:
14169
diff
changeset
|
29 |
13053 | 30 ;;; Code: |
31 | |
32 (require 'calendar) | |
33 | |
93643
e6a9bdb70ed7
(calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents:
93481
diff
changeset
|
34 (defun calendar-iso-to-absolute (date) |
13053 | 35 "The number of days elapsed between the Gregorian date 12/31/1 BC and DATE. |
36 The `ISO year' corresponds approximately to the Gregorian year, but | |
37 weeks start on Monday and end on Sunday. The first week of the ISO year is | |
38 the first such week in which at least 4 days are in a year. The ISO | |
39 commercial DATE has the form (week day year) in which week is in the range | |
40 1..52 and day is in the range 0..6 (1 = Monday, 2 = Tuesday, ..., 0 = | |
41 Sunday). The Gregorian date Sunday, December 31, 1 BC is imaginary." | |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93782
diff
changeset
|
42 (let ((day (calendar-extract-day date))) |
13053 | 43 (+ (calendar-dayname-on-or-before |
92818
3ed51c637a80
(calendar-absolute-from-iso, calendar-iso-read-args): Simplify.
Glenn Morris <rgm@gnu.org>
parents:
92625
diff
changeset
|
44 1 (+ 3 (calendar-absolute-from-gregorian |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93782
diff
changeset
|
45 (list 1 1 (calendar-extract-year date))))) |
92818
3ed51c637a80
(calendar-absolute-from-iso, calendar-iso-read-args): Simplify.
Glenn Morris <rgm@gnu.org>
parents:
92625
diff
changeset
|
46 ;; ISO date is (week day year); normally (month day year). |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93782
diff
changeset
|
47 (* 7 (1- (calendar-extract-month date))) |
92586
15aa69393e42
Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents:
79703
diff
changeset
|
48 (if (zerop day) 6 (1- day))))) |
13053 | 49 |
93643
e6a9bdb70ed7
(calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents:
93481
diff
changeset
|
50 (define-obsolete-function-alias 'calendar-absolute-from-iso |
e6a9bdb70ed7
(calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents:
93481
diff
changeset
|
51 'calendar-iso-to-absolute "23.1") |
e6a9bdb70ed7
(calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents:
93481
diff
changeset
|
52 |
96298
c3ebac47d0e9
(calendar-iso-from-absolute): Add autoload cookie.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
53 ;;;###cal-autoload |
13053 | 54 (defun calendar-iso-from-absolute (date) |
55 "Compute the `ISO commercial date' corresponding to the absolute DATE. | |
56 The ISO year corresponds approximately to the Gregorian year, but weeks | |
57 start on Monday and end on Sunday. The first week of the ISO year is the | |
58 first such week in which at least 4 days are in a year. The ISO commercial | |
59 date has the form (week day year) in which week is in the range 1..52 and | |
60 day is in the range 0..6 (1 = Monday, 2 = Tuesday, ..., 0 = Sunday). The | |
61 absolute date is the number of days elapsed since the (imaginary) Gregorian | |
62 date Sunday, December 31, 1 BC." | |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93782
diff
changeset
|
63 (let* ((approx (calendar-extract-year |
13053 | 64 (calendar-gregorian-from-absolute (- date 3)))) |
65 (year (+ approx | |
66 (calendar-sum y approx | |
93643
e6a9bdb70ed7
(calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents:
93481
diff
changeset
|
67 (>= date (calendar-iso-to-absolute |
92902 | 68 (list 1 1 (1+ y)))) |
69 1)))) | |
13053 | 70 (list |
93643
e6a9bdb70ed7
(calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents:
93481
diff
changeset
|
71 (1+ (/ (- date (calendar-iso-to-absolute (list 1 1 year))) 7)) |
13053 | 72 (% date 7) |
73 year))) | |
74 | |
92833
272f566348a7
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92818
diff
changeset
|
75 ;;;###cal-autoload |
13053 | 76 (defun calendar-iso-date-string (&optional date) |
92818
3ed51c637a80
(calendar-absolute-from-iso, calendar-iso-read-args): Simplify.
Glenn Morris <rgm@gnu.org>
parents:
92625
diff
changeset
|
77 "String of ISO date of Gregorian DATE, default today." |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
38422
diff
changeset
|
78 (let* ((d (calendar-absolute-from-gregorian |
13053 | 79 (or date (calendar-current-date)))) |
80 (day (% d 7)) | |
81 (iso-date (calendar-iso-from-absolute d))) | |
82 (format "Day %s of week %d of %d" | |
83 (if (zerop day) 7 day) | |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93782
diff
changeset
|
84 (calendar-extract-month iso-date) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93782
diff
changeset
|
85 (calendar-extract-year iso-date)))) |
13053 | 86 |
92833
272f566348a7
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92818
diff
changeset
|
87 ;;;###cal-autoload |
93643
e6a9bdb70ed7
(calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents:
93481
diff
changeset
|
88 (defun calendar-iso-print-date () |
13053 | 89 "Show equivalent ISO date for the date under the cursor." |
90 (interactive) | |
91 (message "ISO date: %s" | |
92 (calendar-iso-date-string (calendar-cursor-to-date t)))) | |
93 | |
93643
e6a9bdb70ed7
(calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents:
93481
diff
changeset
|
94 (define-obsolete-function-alias 'calendar-print-iso-date |
e6a9bdb70ed7
(calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents:
93481
diff
changeset
|
95 'calendar-iso-print-date "23.1") |
e6a9bdb70ed7
(calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents:
93481
diff
changeset
|
96 |
93185
5a7437fafea3
(calendar-iso-read-date): New name for calendar-iso-read-args. Update
Glenn Morris <rgm@gnu.org>
parents:
92902
diff
changeset
|
97 (defun calendar-iso-read-date (&optional dayflag) |
92818
3ed51c637a80
(calendar-absolute-from-iso, calendar-iso-read-args): Simplify.
Glenn Morris <rgm@gnu.org>
parents:
92625
diff
changeset
|
98 "Interactively read the arguments for an ISO date command. |
92625
e26350e23411
(calendar-iso-read-args): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
92609
diff
changeset
|
99 Reads a year and week, and if DAYFLAG is non-nil a day (otherwise |
e26350e23411
(calendar-iso-read-args): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
92609
diff
changeset
|
100 taken to be 1)." |
92818
3ed51c637a80
(calendar-absolute-from-iso, calendar-iso-read-args): Simplify.
Glenn Morris <rgm@gnu.org>
parents:
92625
diff
changeset
|
101 (let* ((year (calendar-read |
57324
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
102 "ISO calendar year (>0): " |
92586
15aa69393e42
Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents:
79703
diff
changeset
|
103 (lambda (x) (> x 0)) |
93844
bf9ef749c23e
Replace int-to-string with number-to-string.
Glenn Morris <rgm@gnu.org>
parents:
93809
diff
changeset
|
104 (number-to-string (calendar-extract-year |
92818
3ed51c637a80
(calendar-absolute-from-iso, calendar-iso-read-args): Simplify.
Glenn Morris <rgm@gnu.org>
parents:
92625
diff
changeset
|
105 (calendar-current-date))))) |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93782
diff
changeset
|
106 (no-weeks (calendar-extract-month |
57324
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
107 (calendar-iso-from-absolute |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
108 (1- |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
109 (calendar-dayname-on-or-before |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
110 1 (calendar-absolute-from-gregorian |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
111 (list 1 4 (1+ year)))))))) |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
112 (week (calendar-read |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
113 (format "ISO calendar week (1-%d): " no-weeks) |
92586
15aa69393e42
Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents:
79703
diff
changeset
|
114 (lambda (x) (and (> x 0) (<= x no-weeks))))) |
57324
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
115 (day (if dayflag (calendar-read |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
116 "ISO day (1-7): " |
92586
15aa69393e42
Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents:
79703
diff
changeset
|
117 (lambda (x) (and (<= 1 x) (<= x 7)))) |
57324
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
118 1))) |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
119 (list (list week day year)))) |
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
120 |
93643
e6a9bdb70ed7
(calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents:
93481
diff
changeset
|
121 (define-obsolete-function-alias 'calendar-iso-read-args |
e6a9bdb70ed7
(calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents:
93481
diff
changeset
|
122 'calendar-iso-read-date "23.1") |
93185
5a7437fafea3
(calendar-iso-read-date): New name for calendar-iso-read-args. Update
Glenn Morris <rgm@gnu.org>
parents:
92902
diff
changeset
|
123 |
92833
272f566348a7
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92818
diff
changeset
|
124 ;;;###cal-autoload |
93643
e6a9bdb70ed7
(calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents:
93481
diff
changeset
|
125 (defun calendar-iso-goto-date (date &optional noecho) |
92818
3ed51c637a80
(calendar-absolute-from-iso, calendar-iso-read-args): Simplify.
Glenn Morris <rgm@gnu.org>
parents:
92625
diff
changeset
|
126 "Move cursor to ISO DATE; echo ISO date unless NOECHO is non-nil." |
93185
5a7437fafea3
(calendar-iso-read-date): New name for calendar-iso-read-args. Update
Glenn Morris <rgm@gnu.org>
parents:
92902
diff
changeset
|
127 (interactive (calendar-iso-read-date t)) |
57324
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
128 (calendar-goto-date (calendar-gregorian-from-absolute |
93643
e6a9bdb70ed7
(calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents:
93481
diff
changeset
|
129 (calendar-iso-to-absolute date))) |
e6a9bdb70ed7
(calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents:
93481
diff
changeset
|
130 (or noecho (calendar-iso-print-date))) |
e6a9bdb70ed7
(calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents:
93481
diff
changeset
|
131 |
e6a9bdb70ed7
(calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents:
93481
diff
changeset
|
132 (define-obsolete-function-alias 'calendar-goto-iso-date |
e6a9bdb70ed7
(calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents:
93481
diff
changeset
|
133 'calendar-iso-goto-date "23.1") |
57324
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
134 |
92833
272f566348a7
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92818
diff
changeset
|
135 ;;;###cal-autoload |
93643
e6a9bdb70ed7
(calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents:
93481
diff
changeset
|
136 (defun calendar-iso-goto-week (date &optional noecho) |
92818
3ed51c637a80
(calendar-absolute-from-iso, calendar-iso-read-args): Simplify.
Glenn Morris <rgm@gnu.org>
parents:
92625
diff
changeset
|
137 "Move cursor to ISO DATE; echo ISO date unless NOECHO is non-nil. |
57324
f51c087984a0
Update copyright and maintainer.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
138 Interactively, goes to the first day of the specified week." |
93185
5a7437fafea3
(calendar-iso-read-date): New name for calendar-iso-read-args. Update
Glenn Morris <rgm@gnu.org>
parents:
92902
diff
changeset
|
139 (interactive (calendar-iso-read-date)) |
13053 | 140 (calendar-goto-date (calendar-gregorian-from-absolute |
93643
e6a9bdb70ed7
(calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents:
93481
diff
changeset
|
141 (calendar-iso-to-absolute date))) |
e6a9bdb70ed7
(calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents:
93481
diff
changeset
|
142 (or noecho (calendar-iso-print-date))) |
e6a9bdb70ed7
(calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents:
93481
diff
changeset
|
143 |
e6a9bdb70ed7
(calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents:
93481
diff
changeset
|
144 (define-obsolete-function-alias 'calendar-goto-iso-week |
e6a9bdb70ed7
(calendar-iso-to-absolute): Rename calendar-absolute-from-iso.
Glenn Morris <rgm@gnu.org>
parents:
93481
diff
changeset
|
145 'calendar-iso-goto-week "23.1") |
13053 | 146 |
92586
15aa69393e42
Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents:
79703
diff
changeset
|
147 (defvar date) |
15aa69393e42
Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents:
79703
diff
changeset
|
148 |
93782 | 149 ;; To be called from diary-list-sexp-entries, where DATE is bound. |
92833
272f566348a7
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92818
diff
changeset
|
150 ;;;###diary-autoload |
13053 | 151 (defun diary-iso-date () |
152 "ISO calendar equivalent of date diary entry." | |
153 (format "ISO date: %s" (calendar-iso-date-string date))) | |
154 | |
155 (provide 'cal-iso) | |
156 | |
92586
15aa69393e42
Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents:
79703
diff
changeset
|
157 ;; arch-tag: 3c0154cc-d30f-4981-9f60-42bdf7a468f6 |
13053 | 158 ;;; cal-iso.el ends here |