[PATCH] hyperbole now requires ibuffer
17 years, 8 months
Vin Shelton
Vin Shelton
Since Jeff's recent changes, without this patch, I cannot build
hyperbole. It appears the package smoketest is broken as well (from
http://labb.contactor.se/~matsl/smoketest/logs/2006-07-31-18:02_buildAll_... :
Loading hmouse-sh...
Initializing Hyperbole, please wait... # bind (
stack-trace-on-signal debug-on-signal stack-trace-on-error debug-on-error)
signal(file-error ("Cannot open load file" "ibuffer"))
# bind (data error-symbol)
signal-error(file-error ("Cannot open load file" "ibuffer"))
# bind (error-data)
normal-top-level()
# (condition-case ... . error)
# (catch top-levelmake[2]: *** [auto-autoloads.elc] Killed
make[2]: Leaving directory `/home/matsl/work/smoketest/build/packages/xemacs-packages/hyperbole'
make[1]: *** [hyperbole/bytecompile.target] Error 2
make[1]: Leaving directory `/home/matsl/work/smoketest/build/packages/xemacs-packages'
make: *** [xemacs-packages/bytecompile.target] Error 2
------ End of build -- all from top level
Ville, do you want me to commit this?
- Vin
packages source patch:
Diff command: cvs -q diff -u
Files affected: xemacs-packages/hyperbole/Makefile
Index: xemacs-packages/hyperbole/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/hyperbole/ChangeLog,v
retrieving revision 1.15
diff -a -u -u -r1.15 ChangeLog
--- xemacs-packages/hyperbole/ChangeLog 2004/10/04 12:07:46 1.15
+++ xemacs-packages/hyperbole/ChangeLog 2006/08/01 03:26:05
＠＠ -1,3 +1,7 ＠＠
+2006-07-31 Vin Shelton <acs(a)xemacs.org>
+
+ * Makefile (REQUIRES): Add ibuffer.
+
2004-09-29 Steve Youngs <steve(a)youngs.au.com>
* Makefile (REQUIRES): Add ecrypto.
Index: xemacs-packages/hyperbole/Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/hyperbole/Makefile,v
retrieving revision 1.9
diff -a -u -u -r1.9 Makefile
--- xemacs-packages/hyperbole/Makefile 2004/10/04 12:07:46 1.9
+++ xemacs-packages/hyperbole/Makefile 2006/08/01 03:26:05
＠＠ -25,7 +25,7 ＠＠
PACKAGE = hyperbole
PKG_TYPE = regular
REQUIRES = xemacs-base mail-lib calendar vm text-modes gnus mh-e rmail apel tm \
- sh-script net-utils ecrypto
+ sh-script net-utils ecrypto ibuffer
CATEGORY = standard
EXTRA_SOURCES = hsite.el hui-em19-b.el hui-ep-but.el hui-epV4-b.el \
- 6 participants
- 8 comments
[PATCH] Raw strings, from Python via SXEmacs
17 years, 8 months
Aidan Kehoe
Aidan Kehoe
This patch integrates Martin Kuehl’s raw strings into XEmacs 21.5, extending
it to optionally handle Unicode escapes as does Python, and fixing a problem
that arose in lisp-interaction-mode, where raw strings were parsed as normal
strings if you did a C-j after them, becase forward-sexp couldn’t handle
them.
lisp/ChangeLog addition:
2006-07-16 Aidan Kehoe <kehoea(a)parhasard.net>
* lisp.el (forward-sexp):
Handle raw strings specially just as we do structures. Fixes
problems evaluating them in *scratch*.
man/ChangeLog addition:
2006-07-16 Aidan Kehoe <kehoea(a)parhasard.net>
* lispref/objects.texi (String Type):
Give details of the raw string syntax, taken from SXEmacs and
Python.
src/ChangeLog addition:
2006-07-16 Aidan Kehoe <kehoea(a)parhasard.net>
Martin Kuehl's raw string syntax, from Python via SXEmacs.
* lread.c (read_unicode_escape):
Refactor this code out from read_escape, since it's now called
from read_string as well.
* lread.c (read_escape):
Call read_unicode_escape instead of using inline code,
* lread.c (read_string):
Refactor out from read1, provide raw and honor_unicode options.
* lread.c (read_raw_string):
Added, a function that calls read_string with the correct
arguments for a raw string.
* lread.c (read1):
Pass raw strings to read_raw_string; pass strings to read_string.
XEmacs Trunk source patch:
Diff command: cvs -q diff -u
Files affected: src/lread.c man/lispref/objects.texi lisp/lisp.el
Index: lisp/lisp.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/lisp.el,v
retrieving revision 1.5
diff -u -u -r1.5 lisp.el
--- lisp/lisp.el 2001/04/12 18:21:29 1.5
+++ lisp/lisp.el 2006/07/16 17:56:06
＠＠ -60,19 +60,20 ＠＠
(interactive "_p")
(or arg (setq arg 1))
;; XEmacs: evil hack! The other half of the evil hack below.
- (if (and (> arg 0) (looking-at "#s("))
- (goto-char (+ (point) 2)))
+ (if (and (> arg 0) (looking-at "#s(\\|#r[uU]\\{0,1\\}\""))
+ (goto-char (1+ (- (point) (- (match-end 0) (match-beginning 0))))))
(goto-char (or (scan-sexps (point) arg) (buffer-end arg)))
- (if (< arg 0) (backward-prefix-chars))
- ;; XEmacs: evil hack! Skip back over #s so that structures are read
- ;; properly. the current cheesified syntax tables just aren't up to
- ;; this.
- (if (and (< arg 0)
- (eq (char-after (point)) ?\()
- (>= (- (point) (point-min)) 2)
- (eq (char-after (- (point) 1)) ?s)
- (eq (char-after (- (point) 2)) ?#))
- (goto-char (- (point) 2))))
+ (when (< arg 0)
+ (backward-prefix-chars)
+ ;; XEmacs: evil hack! Skip back over #[sr] so that structures and raw
+ ;; strings are read properly. the current cheesified syntax tables just
+ ;; aren't up to this.
+ (let* ((diff (- (point) (point-min)))
+ (subject (buffer-substring (- (point) (min diff 3))
+ (1+ (point))))
+ (matched (string-match "#s(\\|#r[uU]\\{0,1\\}\"" subject)))
+ (if matched
+ (goto-char (1+ (- (point) (- (length subject) matched))))))))
(defun backward-sexp (&optional arg)
"Move backward across one balanced expression (sexp).
Index: man/lispref/objects.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/lispref/objects.texi,v
retrieving revision 1.8
diff -u -u -r1.8 objects.texi
--- man/lispref/objects.texi 2006/04/29 14:36:54 1.8
+++ man/lispref/objects.texi 2006/07/16 17:56:11
＠＠ -1079,6 +1079,16 ＠＠
escape any backslash or double-quote characters in the string with a
backslash, like this: ＠code{"this \" is an embedded quote"}.
+ An alternative syntax allows insertion of raw backslashes into a
+string, like this: ＠code{#r"this \ is an embedded backslash"}. In such
+a string, each character following a backslash is included literally in
+the string, and all backslashes are left in the string. This means that
+＠code{#r"\""} is a valid string literal with two characters, a backslash and a
+double-quote. It also means that a string with this syntax ＠emph{cannot end
+in a single backslash}. As with Python, from where this syntax was
+taken, you can specify ＠code{u} or ＠code{U} after the ＠code{#r} to
+specify that interpretation of Unicode escapes should be done.
+
The newline character is not special in the read syntax for strings;
if you write a new line between the double-quotes, it becomes a
character in the string. But an escaped newline---one that is preceded
Index: src/lread.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lread.c,v
retrieving revision 1.78
diff -u -u -r1.78 lread.c
--- src/lread.c 2006/06/03 17:50:54 1.78
+++ src/lread.c 2006/07/16 17:56:12
＠＠ -1670,15 +1670,56 ＠＠
return val;
}
+
+/* A Unicode escape, as in C# (though we only permit them in strings
+ and characters, not arbitrarily in the source code.) */
+static Ichar
+read_unicode_escape (Lisp_Object readcharfun, int unicode_hex_count)
+{
+ REGISTER Ichar i = 0, c;
+ REGISTER int count = 0;
+ Lisp_Object lisp_char;
+ while (++count <= unicode_hex_count)
+ {
+ c = readchar (readcharfun);
+ /* Remember, can't use isdigit(), isalpha() etc. on Ichars */
+ if (c >= '0' && c <= '9') i = (i << 4) + (c - '0');
+ else if (c >= 'a' && c <= 'f') i = (i << 4) + (c - 'a') + 10;
+ else if (c >= 'A' && c <= 'F') i = (i << 4) + (c - 'A') + 10;
+ else
+ {
+ syntax_error ("Non-hex digit used for Unicode escape",
+ make_char (c));
+ break;
+ }
+ }
+
+ lisp_char = Funicode_to_char(make_int(i), Qnil);
+
+ if (EQ(Qnil, lisp_char))
+ {
+ /* This is ugly and horrible and trashes the user's data, but
+ it's what unicode.c does. In the future, unicode-to-char
+ should not return nil. */
+#ifdef MULE
+ i = make_ichar (Vcharset_japanese_jisx0208, 34 + 128, 46 + 128);
+#else
+ i = '~';
+#endif
+ return i;
+ }
+ else
+ {
+ return XCHAR(lisp_char);
+ }
+}
+
static Ichar
read_escape (Lisp_Object readcharfun)
{
/* This function can GC */
Ichar c = readchar (readcharfun);
- /* \u allows up to four hex digits, \U up to eight. Default to the
- behaviour for \u, and change this value in the case that \U is seen. */
- int unicode_hex_count = 4;
if (c < 0)
signal_error (Qend_of_file, 0, READCHARFUN_MAYBE (readcharfun));
＠＠ -1797,50 +1838,11 ＠＠
}
case 'U':
/* Post-Unicode-2.0: Up to eight hex chars */
- unicode_hex_count = 8;
+ return read_unicode_escape(readcharfun, 8);
case 'u':
+ /* Unicode-2.0 and before; four hex chars. */
+ return read_unicode_escape(readcharfun, 4);
- /* A Unicode escape, as in C# (though we only permit them in strings
- and characters, not arbitrarily in the source code.) */
- {
- REGISTER Ichar i = 0;
- REGISTER int count = 0;
- Lisp_Object lisp_char;
- while (++count <= unicode_hex_count)
- {
- c = readchar (readcharfun);
- /* Remember, can't use isdigit(), isalpha() etc. on Ichars */
- if (c >= '0' && c <= '9') i = (i << 4) + (c - '0');
- else if (c >= 'a' && c <= 'f') i = (i << 4) + (c - 'a') + 10;
- else if (c >= 'A' && c <= 'F') i = (i << 4) + (c - 'A') + 10;
- else
- {
- syntax_error ("Non-hex digit used for Unicode escape",
- make_char (c));
- break;
- }
- }
-
- lisp_char = Funicode_to_char(make_int(i), Qnil);
-
- if (EQ(Qnil, lisp_char))
- {
- /* This is ugly and horrible and trashes the user's data, but
- it's what unicode.c does. In the future, unicode-to-char
- should not return nil. */
-#ifdef MULE
- i = make_ichar (Vcharset_japanese_jisx0208, 34 + 128, 46 + 128);
-#else
- i = '~';
-#endif
- return i;
- }
- else
- {
- return XCHAR(lisp_char);
- }
- }
-
default:
return c;
}
＠＠ -2270,6 +2272,113 ＠＠
}
#endif
+static Lisp_Object
+read_string (Lisp_Object readcharfun, Ichar delim, int raw,
+ int honor_unicode)
+{
+#ifdef I18N3
+ /* #### If the input stream is translating, then the string
+ should be marked as translatable by setting its
+ `string-translatable' property to t. .el and .elc files
+ normally are translating input streams. See Fgettext()
+ and print_internal(). */
+#endif
+ Ichar c;
+ int cancel = 0;
+
+ Lstream_rewind(XLSTREAM(Vread_buffer_stream));
+ while ((c = readchar(readcharfun)) >= 0 && c != delim)
+ {
+ if (c == '\\')
+ {
+ if (raw)
+ {
+ c = readchar(readcharfun);
+ if (honor_unicode && ('u' == c || 'U' == c))
+ {
+ c = read_unicode_escape(readcharfun,
+ 'U' == c ? 8 : 4);
+ }
+ else
+ {
+ /* For raw strings, insert the
+ backslash and the next char, */
+ Lstream_put_ichar(XLSTREAM
+ (Vread_buffer_stream),
+ '\\');
+ }
+ }
+ else
+ /* otherwise, backslash escapes the next char. */
+ c = read_escape(readcharfun);
+ }
+ /* c is -1 if \ newline has just been seen */
+ if (c == -1)
+ {
+ if (Lstream_byte_count
+ (XLSTREAM(Vread_buffer_stream)) ==
+ 0)
+ cancel = 1;
+ }
+ else
+ Lstream_put_ichar(XLSTREAM
+ (Vread_buffer_stream),
+ c);
+ QUIT;
+ }
+ if (c < 0)
+ return Fsignal(Qend_of_file,
+ list1(READCHARFUN_MAYBE(readcharfun)));
+
+ /* If purifying, and string starts with \ newline,
+ return zero instead. This is for doc strings
+ that we are really going to find in lib-src/DOC.nn.nn */
+ if (purify_flag && NILP(Vinternal_doc_file_name)
+ && cancel)
+ return Qzero;
+
+ Lstream_flush(XLSTREAM(Vread_buffer_stream));
+ return make_string(resizing_buffer_stream_ptr
+ (XLSTREAM(Vread_buffer_stream)),
+ Lstream_byte_count(XLSTREAM(Vread_buffer_stream)));
+}
+
+static Lisp_Object
+read_raw_string (Lisp_Object readcharfun)
+{
+ Ichar c;
+ Ichar permit_unicode = 0;
+
+ do {
+ c = reader_nextchar(readcharfun);
+ switch (c) {
+ /* #r:engine"my sexy raw string" -- raw string w/ flags*/
+ /* case ':': */
+ /* #ru"Hi there\u20AC \U000020AC" -- raw string, honouring Unicode. */
+ case 'u':
+ case 'U':
+ permit_unicode = c;
+ continue;
+
+ /* #r"my raw string" -- raw string */
+ case '\"':
+ return read_string(readcharfun, '\"', 1, permit_unicode);
+ /* invalid syntax */
+ default:
+ {
+ if (permit_unicode)
+ {
+ unreadchar(readcharfun, permit_unicode);
+ }
+ unreadchar(readcharfun, c);
+ return Fsignal(Qinvalid_read_syntax,
+ list1(build_string
+ ("unrecognized raw string syntax")));
+ }
+ }
+ } while (1);
+}
+
/* Read the next Lisp object from the stream READCHARFUN and return it.
If the return value is a cons whose car is Qunbound, then read1()
encountered a misplaced token (e.g. a right bracket, right paren,
＠＠ -2509,6 +2618,8 ＠＠
case 'x': return read_integer (readcharfun, 16);
/* #b010 => 2 -- binary constant syntax */
case 'b': return read_integer (readcharfun, 2);
+ /* #r"raw\stringt" -- raw string syntax */
+ case 'r': return read_raw_string(readcharfun);
/* #s(foobar key1 val1 key2 val2) -- structure syntax */
case 's': return read_structure (readcharfun);
case '<':
＠＠ -2654,48 +2765,8 ＠＠
}
case '\"':
- {
- /* String */
-#ifdef I18N3
- /* #### If the input stream is translating, then the string
- should be marked as translatable by setting its
- `string-translatable' property to t. .el and .elc files
- normally are translating input streams. See Fgettext()
- and print_internal(). */
-#endif
- int cancel = 0;
-
- Lstream_rewind (XLSTREAM (Vread_buffer_stream));
- while ((c = readchar (readcharfun)) >= 0
- && c != '\"')
- {
- if (c == '\\')
- c = read_escape (readcharfun);
- /* c is -1 if \ newline has just been seen */
- if (c == -1)
- {
- if (Lstream_byte_count (XLSTREAM (Vread_buffer_stream)) == 0)
- cancel = 1;
- }
- else
- Lstream_put_ichar (XLSTREAM (Vread_buffer_stream), c);
- QUIT;
- }
- if (c < 0)
- return Fsignal (Qend_of_file, list1 (READCHARFUN_MAYBE (readcharfun)));
-
- /* If purifying, and string starts with \ newline,
- return zero instead. This is for doc strings
- that we are really going to find in lib-src/DOC.nn.nn */
- if (purify_flag && NILP (Vinternal_doc_file_name) && cancel)
- return Qzero;
-
- Lstream_flush (XLSTREAM (Vread_buffer_stream));
- return
- make_string
- (resizing_buffer_stream_ptr (XLSTREAM (Vread_buffer_stream)),
- Lstream_byte_count (XLSTREAM (Vread_buffer_stream)));
- }
+ /* String */
+ return read_string(readcharfun, '\"', 0, 1);
default:
{
--
Santa Maradona, priez pour moi!
- 2 participants
- 4 comments
[PATCH] Check dispatch_event_queue on the TTY, too.
17 years, 8 months
Aidan Kehoe
Aidan Kehoe
Ar an t-ochtú lá déag de mí Iúil, scríobh Stephen J. Turnbull:
> Do you mean XEmacs is running on Linux, or that the TTY is on Linux? I
> can't reproduce with XEmacs running on Linux but displaying to a Mac OS X
> Terminal.
I’ll bet your binary is built with X11 support, and Jerry’s isn’t. I can
reproduce the problem locally when I build without X11 support, so it’s not
Linux-specific; the issue is that drain_tty_devices in event-unixoid.c adds
events to dispatch_event_queue on a just-TTY-support build, but nothing
reads from dispatch_event_queue. Which then goes and leaks--I hope this is
the memory leak I’ve been seeing on the TTY.
src/ChangeLog addition:
2006-07-18 Aidan Kehoe <kehoea(a)parhasard.net>
* event-tty.c (emacs_tty_next_event):
Check dispatch_event_queue for pending events, since we add to
that in drain_tty_devices(). Fixes dropped key sequences on TTY
builds.
XEmacs Trunk source patch:
Diff command: cvs -q diff -u
Files affected: src/event-tty.c
Index: src/event-tty.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/event-tty.c,v
retrieving revision 1.16
diff -u -u -r1.16 event-tty.c
--- src/event-tty.c 2004/11/04 23:06:27 1.16
+++ src/event-tty.c 2006/07/18 18:39:23
＠＠ -113,6 +113,16 ＠＠
EMACS_TIME time_to_block;
EMACS_SELECT_TIME select_time_to_block, *pointer_to_this;
+ if (!NILP (dispatch_event_queue))
+ {
+ Lisp_Object event, event2;
+ event2 = wrap_event (emacs_event);
+ event = dequeue_dispatch_event ();
+ Fcopy_event (event, event2);
+ Fdeallocate_event (event);
+ return;
+ }
+
if (!get_low_level_timeout_interval (tty_timer_queue, &time_to_block))
/* no timer events; block indefinitely */
pointer_to_this = 0;
--
Santa Maradona, priez pour moi!
- 1 participants
- 1 comments
[PATCH] calendar syncs with Emacs CVS
17 years, 8 months
Jeff Miller
Jeff Miller
Some syncs from Emacs CVS. As you can see.... I have a ways to go. :-)
I plan to commit in the next day or so.
Jeff
ChangeLog addition:
2006-08-02 Jeff Miller <jeff.miller(a)xemacs.org>
2002-04-04 Richard M. Stallman <rms(a)gnu.org>
* calendar/solar.el (solar-northern-spring-or-summer-season): Doc fix.
2002-04-03 Edward M. Reingold <reingold(a)emr.cs.iit.edu>
* solar.el (solar-spring-or-summer-season): Delete.
(solar-northern-spring-or-summer-season): New variable.
(solar-sunrise-and-sunset, solar-moment, solar-sunrise-sunset):
Rewrite.
* solar.el (diary-sabbath-candles-minutes): New variable.
(diary-sabbath-candles): Use it instead of fixed 18 minutes.
* calendar.el (update-calendar-mode-line): Force mode-line update.
Make date under the cursor available as `date' in
calendar-mode-line-format.
Eval items in calendar-mode-line-format list.
* cal-tex.el (cal-tex-hook, cal-tex-year-hook, cal-tex-month-hook)
(cal-tex-week-hook, cal-tex-daily-hook): Add doc strings.
* cal-tex.el (cal-tex-latexify-list): Fix doc string.
* cal-tex.el (cal-tex-insert-day-names): LaTeXify day names.
(cal-tex-cursor-week-iso, cal-tex-week-hours, cal-tex-weekly4-box)
(cal-tex-cursor-filofax-2week, cal-tex-cursor-filofax-week)
(cal-tex-daily-page, cal-tex-mini-calendar): LaTeXify day names.
* cal-tex.el: Change all instances (interactive "P") to
(interactive "p").
(cal-tex-cursor-month): Add hfill and newline at end of month that
ended on Saturday.
(cal-tex-preamble): Change to LaTeX2e.
(cal-tex-cursor-filofax-year): Don't use default month names in
LaTeX macros in case user changes them.
(cal-tex-month-name): New function. Used throughout in case user
has done something funny with month names.
* cal-hebrew.el (holiday-rosh-hashanah-etc): Spelling correction.
(diary-rosh-hodesh): Spelling correction.
2002-03-03 Thien-Thi Nguyen <ttn(a)gnu.org>
* calendar/diary-lib.el (list-diary-entries): Use `buffer-substring'
instead of `buffer-substring-no-properties' to support enriched mode.
2002-02-08 Eli Zaretskii <eliz(a)is.elta.co.il>
* calendar/cal-menu.el (calendar-mode-map): Change the menu item's
name to "Insert Diary Entry".
* updated "Diary" menu entries to match Emacs
2002-01-28 Eli Zaretskii <eliz(a)is.elta.co.il>
* calendar/calendar.el (generate-calendar-month): Doc fix.
2002-01-24 Richard M. Stallman <rms(a)gnu.org>
* calendar/calendar.el (generate-calendar-month): Doc fix.
2002-01-03 Richard M. Stallman <rms(a)gnu.org>
* calendar/diary-lib.el (diary-block): Doc fix.
2001-11-26 Pavel Jan,Am(Bk <Pavel(a)Janik.cz>
* calendar/appt.el (appt-disp-window): Use insert instead of
insert-string.
* calendar/diary-lib.el (list-diary-entries): Likewise.
calendar source patch:
Diff command: cvs -q diff -uN
Files affected: solar.el diary-lib.el calendar.el cal-xemacs.el cal-tex.el cal-hebrew.el appt.el
Index: appt.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/appt.el,v
retrieving revision 1.10
diff -u -b -w -u -r1.10 appt.el
--- appt.el 2006/07/31 02:15:22 1.10
+++ appt.el 2006/08/03 02:32:19
＠＠ -683,7 +683,7 ＠＠
(concat "-------------------- Appointment in "
min-to-app " minutes. " new-time " %-"))
(erase-buffer)
- (insert-string appt-msg)
+ (insert appt-msg)
(shrink-window-if-larger-than-buffer (get-buffer-window appt-disp-buf t))
(set-buffer-modified-p nil)
(raise-frame (selected-frame))
Index: cal-hebrew.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/cal-hebrew.el,v
retrieving revision 1.4
diff -u -b -w -u -r1.4 cal-hebrew.el
--- cal-hebrew.el 2006/07/31 02:15:22 1.4
+++ cal-hebrew.el 2006/08/03 02:32:19
＠＠ -347,7 +347,7 ＠＠
(list (calendar-gregorian-from-absolute (+ abs-r-h 19))
"Hol Hamoed Sukkot (fourth day)")
(list (calendar-gregorian-from-absolute (+ abs-r-h 20))
- "Hoshannah Rabbah")))
+ "Hoshanah Rabbah")))
(output-list
(filter-visible-calendar-holidays mandatory)))
(if all-hebrew-calendar-holidays
＠＠ -979,9 +979,9 ＠＠
(if (= h-yesterday 30)
(format "%s (second day)" this-month)
this-month)))
- (if (= (% d 7) 6);; Saturday--check for Shabbat Mevarhim
+ (if (= (% d 7) 6);; Saturday--check for Shabbat Mevarchim
(cond ((and (> h-day 22) (/= h-month 6) (= 29 last-day))
- (format "Mevarhim Rosh Hodesh %s (%s)"
+ (format "Mevarchim Rosh Hodesh %s (%s)"
(aref h-month-names
(if (= h-month
(hebrew-calendar-last-month-of-year
＠＠ -989,7 +989,7 ＠＠
0 h-month))
(aref calendar-day-name-array (- 29 h-day))))
((and (< h-day 30) (> h-day 22) (= 30 last-day))
- (format "Mevarhim Rosh Hodesh %s (%s-%s)"
+ (format "Mevarchim Rosh Hodesh %s (%s-%s)"
(aref h-month-names h-month)
(if (= h-day 29)
"tomorrow"
Index: cal-tex.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/cal-tex.el,v
retrieving revision 1.4
diff -u -b -w -u -r1.4 cal-tex.el
--- cal-tex.el 2006/07/31 02:15:23 1.4
+++ cal-tex.el 2006/08/03 02:32:19
＠＠ -121,6 +121,35 ＠＠
:type 'integer
:group 'calendar-tex)
+(defcustom cal-tex-hook nil
+ "*List of functions called after any LaTeX calendar buffer is generated.
+You can use this to do postprocessing on the buffer. For example, to change
+characters with diacritical marks to their LaTeX equivalents, use
+ (add-hook 'cal-tex-hook
+ '(lambda () (iso-iso2tex (point-min) (point-max))))"
+:type 'hook
+:group 'calendar-tex)
+
+(defcustom cal-tex-year-hook nil
+ "*List of functions called after a LaTeX year calendar buffer is generated."
+:type 'hook
+:group 'calendar-tex)
+
+(defcustom cal-tex-month-hook nil
+ "*List of functions called after a LaTeX month calendar buffer is generated."
+:type 'hook
+:group 'calendar-tex)
+
+(defcustom cal-tex-week-hook nil
+ "*List of functions called after a LaTeX week calendar buffer is generated."
+:type 'hook
+:group 'calendar-tex)
+
+(defcustom cal-tex-daily-hook nil
+ "*List of functions called after a LaTeX daily calendar buffer is generated."
+:type 'hook
+:group 'calendar-tex)
+
;;;
;;; Definitions for LaTeX code
;;;
＠＠ -221,7 +250,7 ＠＠
Optional ARGS are included."
(set-buffer (get-buffer-create cal-tex-buffer))
(erase-buffer)
- (insert "\\documentstyle")
+ (insert "\\documentclass")
(if args
(insert "[" args "]"))
(insert "{article}\n"
＠＠ -255,14 +284,14 ＠＠
(defun cal-tex-cursor-year (&optional arg)
"Make a buffer with LaTeX commands for the year cursor is on.
Optional prefix argument specifies number of years."
- (interactive "P")
+ (interactive "p")
(cal-tex-year (extract-calendar-year (calendar-cursor-to-date t))
(if arg arg 1)))
(defun cal-tex-cursor-year-landscape (&optional arg)
"Make a buffer with LaTeX commands for the year cursor is on.
Optional prefix argument specifies number of years."
- (interactive "P")
+ (interactive "p")
(cal-tex-year (extract-calendar-year (calendar-cursor-to-date t))
(if arg arg 1)
t))
＠＠ -306,7 +335,7 ＠＠
(defun cal-tex-cursor-filofax-year (&optional arg)
"Make a Filofax one page yearly calendar of year indicated by cursor.
Optional parameter specifies number of years."
- (interactive "P")
+ (interactive "p")
(let* ((n (if arg arg 1))
(year (extract-calendar-year (calendar-cursor-to-date t))))
(cal-tex-preamble "twoside")
＠＠ -327,10 +356,13 ＠＠
(insert "\n")
(cal-tex-noindent)
(cal-tex-nl)
+ (let ((month-names; don't use default in case user changed it
+ ["January" "February" "March" "April" "May" "June"
+ "July" "August" "September" "October" "November" "December"]))
(calendar-for-loop i from 1 to 12 do
(insert (cal-tex-mini-calendar i year
- (calendar-month-name i)
- "1in" ".9in" "tiny" "0.6mm")))
+ (aref month-names (1- i))
+ "1in" ".9in" "tiny" "0.6mm"))))
(insert
"\\noindent\\fbox{\\January}\\fbox{\\February}\\fbox{\\March}\\\\
\\noindent\\fbox{\\April}\\fbox{\\May}\\fbox{\\June}\\\\
＠＠ -355,7 +387,7 ＠＠
"Make a buffer with LaTeX commands for the month cursor is on.
Optional prefix argument specifies number of months to be produced.
The output is in landscape format, one month to a page."
- (interactive "P")
+ (interactive "p")
(let* ((n (if arg arg 1))
(date (calendar-cursor-to-date t))
(month (extract-calendar-month date))
＠＠ -416,7 +448,8 ＠＠
year)))
7)))
(insert "\\vspace*{-\\cellwidth}\\hspace*{-2\\cellwidth}"
- "\\lastmonth\\nextmonth"))
+ "\\lastmonth\\nextmonth%
+ "))
(if (/= i n)
(progn
(run-hooks 'cal-tex-month-hook)
＠＠ -432,7 +465,7 ＠＠
"Make a buffer with LaTeX commands for the month cursor is on.
Optional prefix argument specifies number of months to be produced.
Calendar is condensed onto one page."
- (interactive "P")
+ (interactive "p")
(let* ((date (calendar-cursor-to-date t))
(month (extract-calendar-month date))
(year (extract-calendar-year date))
＠＠ -472,6 +505,15 ＠＠
(setq other-year year)
(cal-tex-insert-days month year diary-list holidays
cal-tex-day-prefix)
+ (if (= (mod (calendar-absolute-from-gregorian
+ (list month
+ (calendar-last-day-of-month month year)
+ year))
+ 7)
+ 6); last day of month was Saturday
+ (progn
+ (cal-tex-hfill)
+ (cal-tex-nl)))
(increment-calendar-month month year 1))
(cal-tex-insert-blank-days-at-end end-month end-year cal-tex-day-prefix)
(cal-tex-end-document)))
＠＠ -493,7 +535,7 ＠＠
(setq date (list month i year))
(if (memq (calendar-day-of-week date) cal-tex-which-days)
(progn
- (insert (format day-format (calendar-month-name month) i))
+ (insert (format day-format (cal-tex-month-name month) i))
(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))
＠＠ -510,16 +552,17 ＠＠
(calendar-for-loop i from 0 to 6 do
(if (memq i cal-tex-which-days)
(insert (format cal-tex-day-name-format
+ (cal-tex-LaTeXify-string
(aref calendar-day-name-array
- (mod (+ calendar-week-start-day i) 7)))))
+ (mod (+ calendar-week-start-day i) 7))))))
(cal-tex-comment)))
(defun cal-tex-insert-month-header (n month year end-month end-year)
"Create a title for a calendar.
A title is inserted for a calendar with N months starting with
MONTH YEAR and ending with END-MONTH END-YEAR."
- (let ((month-name (calendar-month-name month))
- (end-month-name (calendar-month-name end-month)))
+ (let ((month-name (cal-tex-month-name month))
+ (end-month-name (cal-tex-month-name end-month)))
(if (= 1 n)
(insert (format "\\calmonth{%s}{%s}\n\\vspace*{-0.5cm}"
month-name year) )
＠＠ -613,7 +656,7 ＠＠
It applies to the week that point is in.
Optional prefix argument specifies number of weeks.
Holidays are included if `cal-tex-holidays' is t."
- (interactive "P")
+ (interactive "p")
(let* ((n (if arg arg 1))
(date (calendar-gregorian-from-absolute
(calendar-dayname-on-or-before
＠＠ -639,7 +682,7 ＠＠
(cal-tex-vspace "-1.5in")
(cal-tex-b-center)
(cal-tex-Huge-bf (format "\\uppercase{%s}"
- (calendar-month-name month)))
+ (cal-tex-month-name month)))
(cal-tex-hspace "2em")
(cal-tex-Huge-bf (number-to-string year))
(cal-tex-nl ".5cm")
＠＠ -664,7 +707,7 ＠＠
It applies to the week that point is in.
Optional prefix argument specifies number of weeks.
Holidays are included if `cal-tex-holidays' is t."
- (interactive "P")
+ (interactive "p")
(let* ((n (if arg arg 1))
(date (calendar-gregorian-from-absolute
(calendar-dayname-on-or-before
＠＠ -691,7 +734,7 ＠＠
(cal-tex-vspace "-1.5in")
(cal-tex-b-center)
(cal-tex-Huge-bf (format "\\uppercase{%s}"
- (calendar-month-name month)))
+ (cal-tex-month-name month)))
(cal-tex-hspace "2em")
(cal-tex-Huge-bf (number-to-string year))
(cal-tex-nl ".5cm")
＠＠ -744,7 +787,7 ＠＠
Optional prefix argument specifies number of weeks.
Diary entries are included if `cal-tex-diary' is t.
Holidays are included if `cal-tex-holidays' is t."
- (interactive "P")
+ (interactive "p")
(let* ((n (if arg arg 1))
(date (calendar-gregorian-from-absolute
(calendar-dayname-on-or-before
＠＠ -790,9 +833,9 ＠＠
(cal-tex-rule "0pt" "\\textwidth" ".2mm")
(cal-tex-nl)
(cal-tex-b-parbox "t" "\\textwidth")
- (cal-tex-large-bf (calendar-day-name date))
+ (cal-tex-large-bf (cal-tex-LaTeXify-string (calendar-day-name date)))
(insert ", ")
- (cal-tex-large-bf (calendar-month-name month))
+ (cal-tex-large-bf (cal-tex-month-name month))
(insert " ")
(cal-tex-large-bf (number-to-string day))
(if (not (string= "" (cal-tex-latexify-list holidays date)))
＠＠ -844,9 +887,9 ＠＠
(cal-tex-cmd "\\ \\\\[-.2cm]")
(cal-tex-cmd "\\noindent")
(cal-tex-b-parbox "l" "6.8in")
- (cal-tex-large-bf (calendar-day-name date))
+ (cal-tex-large-bf (cal-tex-LaTeXify-string (calendar-day-name date)))
(insert ", ")
- (cal-tex-large-bf (calendar-month-name month))
+ (cal-tex-large-bf (cal-tex-month-name month))
(insert " ")
(cal-tex-large-bf (number-to-string day))
(if (not (string= "" (cal-tex-latexify-list holidays date)))
＠＠ -875,7 +918,7 ＠＠
It applies to the week that point is in, and starts on Monday.
Optional prefix argument specifies number of weeks.
Holidays are included if `cal-tex-holidays' is t."
- (interactive "P")
+ (interactive "p")
(let* ((n (if arg arg 1))
(date (calendar-gregorian-from-absolute
(calendar-dayname-on-or-before
＠＠ -913,12 +956,12 ＠＠
(day (extract-calendar-day date))
(month (extract-calendar-month date))
(year (extract-calendar-year date))
- (dayname (calendar-day-name date))
+ (dayname (cal-tex-LaTeXify-string (calendar-day-name date)))
(date1 (cal-tex-incr-date date))
(day1 (extract-calendar-day date1))
(month1 (extract-calendar-month date1))
(year1 (extract-calendar-year date1))
- (dayname1 (calendar-day-name date1))
+ (dayname1 (cal-tex-LaTeXify-string (calendar-day-name date1)))
)
(cal-tex-b-framebox "8cm" "l")
(cal-tex-b-parbox "b" "7.5cm")
＠＠ -951,7 +994,7 ＠＠
Optional prefix argument specifies number of weeks.
Diary entries are included if `cal-tex-diary' is t.
Holidays are included if `cal-tex-holidays' is t."
- (interactive "P")
+ (interactive "p")
(let* ((n (if arg arg 1))
(date (calendar-gregorian-from-absolute
(calendar-dayname-on-or-before
＠＠ -1011,29 +1054,29 ＠＠
(if (= (extract-calendar-month date)
(extract-calendar-month d))
(format "%s %s"
- (calendar-month-name
+ (cal-tex-month-name
(extract-calendar-month date))
(extract-calendar-year date))
(if (= (extract-calendar-year date)
(extract-calendar-year d))
(format "%s---%s %s"
- (calendar-month-name
+ (cal-tex-month-name
(extract-calendar-month date))
- (calendar-month-name
+ (cal-tex-month-name
(extract-calendar-month d))
(extract-calendar-year date))
(format "%s %s---%s %s"
- (calendar-month-name
+ (cal-tex-month-name
(extract-calendar-month date))
(extract-calendar-year date)
- (calendar-month-name (extract-calendar-month d))
+ (cal-tex-month-name (extract-calendar-month d))
(extract-calendar-year d))))))
(insert "%\n")
(calendar-for-loop j from 1 to 7 do
(if (= (mod i 2) 1)
(insert "\\rightday")
(insert "\\leftday"))
- (cal-tex-arg (calendar-day-name date))
+ (cal-tex-arg (cal-tex-LaTeXify-string (calendar-day-name date)))
(cal-tex-arg (int-to-string (extract-calendar-day date)))
(cal-tex-arg (cal-tex-latexify-list diary-list date))
(cal-tex-arg (cal-tex-latexify-list holidays date))
＠＠ -1053,7 +1096,7 ＠＠
Weeks start on Monday.
Diary entries are included if `cal-tex-diary' is t.
Holidays are included if `cal-tex-holidays' is t."
- (interactive "P")
+ (interactive "p")
(let* ((n (if arg arg 1))
(date (calendar-gregorian-from-absolute
(calendar-dayname-on-or-before
＠＠ -1120,27 +1163,27 ＠＠
(if (= (extract-calendar-month date)
(extract-calendar-month d))
(format "%s %s"
- (calendar-month-name
+ (cal-tex-month-name
(extract-calendar-month date))
(extract-calendar-year date))
(if (= (extract-calendar-year date)
(extract-calendar-year d))
(format "%s---%s %s"
- (calendar-month-name
+ (cal-tex-month-name
(extract-calendar-month date))
- (calendar-month-name
+ (cal-tex-month-name
(extract-calendar-month d))
(extract-calendar-year date))
(format "%s %s---%s %s"
- (calendar-month-name
+ (cal-tex-month-name
(extract-calendar-month date))
(extract-calendar-year date)
- (calendar-month-name (extract-calendar-month d))
+ (cal-tex-month-name (extract-calendar-month d))
(extract-calendar-year d))))))
(insert "%\n")
(calendar-for-loop j from 1 to 3 do
(insert "\\leftday")
- (cal-tex-arg (calendar-day-name date))
+ (cal-tex-arg (cal-tex-LaTeXify-string (calendar-day-name date)))
(cal-tex-arg (int-to-string (extract-calendar-day date)))
(cal-tex-arg (cal-tex-latexify-list diary-list date))
(cal-tex-arg (cal-tex-latexify-list holidays date))
＠＠ -1155,27 +1198,27 ＠＠
(if (= (extract-calendar-month date)
(extract-calendar-month d))
(format "%s %s"
- (calendar-month-name
+ (cal-tex-month-name
(extract-calendar-month date))
(extract-calendar-year date))
(if (= (extract-calendar-year date)
(extract-calendar-year d))
(format "%s---%s %s"
- (calendar-month-name
+ (cal-tex-month-name
(extract-calendar-month date))
- (calendar-month-name
+ (cal-tex-month-name
(extract-calendar-month d))
(extract-calendar-year date))
(format "%s %s---%s %s"
- (calendar-month-name
+ (cal-tex-month-name
(extract-calendar-month date))
(extract-calendar-year date)
- (calendar-month-name (extract-calendar-month d))
+ (cal-tex-month-name (extract-calendar-month d))
(extract-calendar-year d))))))
(insert "%\n")
(calendar-for-loop j from 1 to 2 do
(insert "\\rightday")
- (cal-tex-arg (calendar-day-name date))
+ (cal-tex-arg (cal-tex-LaTeXify-string (calendar-day-name date)))
(cal-tex-arg (int-to-string (extract-calendar-day date)))
(cal-tex-arg (cal-tex-latexify-list diary-list date))
(cal-tex-arg (cal-tex-latexify-list holidays date))
＠＠ -1184,7 +1227,7 ＠＠
(setq date (cal-tex-incr-date date)))
(calendar-for-loop j from 1 to 2 do
(insert "\\weekend")
- (cal-tex-arg (calendar-day-name date))
+ (cal-tex-arg (cal-tex-LaTeXify-string (calendar-day-name date)))
(cal-tex-arg (int-to-string (extract-calendar-day date)))
(cal-tex-arg (cal-tex-latexify-list diary-list date))
(cal-tex-arg (cal-tex-latexify-list holidays date))
＠＠ -1204,7 +1247,7 ＠＠
Diary entries are included if `cal-tex-diary' is t.
Holidays are included if `cal-tex-holidays' is t.
Pages are ruled if `cal-tex-rules' is t."
- (interactive "P")
+ (interactive "p")
(let* ((n (if arg arg 1))
(date (calendar-gregorian-from-absolute
(calendar-dayname-on-or-before
＠＠ -1313,7 +1356,7 ＠＠
(defun cal-tex-cursor-day (&optional arg)
"Make a buffer with LaTeX commands for the day cursor is on.
Optional prefix argument specifies number of days."
- (interactive "P")
+ (interactive "p")
(let ((n (if arg arg 1))
(date (calendar-absolute-from-gregorian (calendar-cursor-to-date t))))
(cal-tex-preamble "12pt")
＠＠ -1335,7 +1378,7 ＠＠
(defun cal-tex-daily-page (date)
"Make a calendar page for Gregorian DATE on 8.5 by 11 paper."
(let* ((hour)
- (month-name (calendar-month-name (extract-calendar-month date))))
+ (month-name (cal-tex-month-name (extract-calendar-month date))))
(cal-tex-banner "cal-tex-daily-page")
(cal-tex-b-makebox "4cm" "l")
(cal-tex-b-parbox "b" "3.8cm")
＠＠ -1350,7 +1393,7 ＠＠
(cal-tex-e-makebox)
(cal-tex-hfill)
(cal-tex-b-makebox "4cm" "r")
- (cal-tex-bf (calendar-day-name date))
+ (cal-tex-bf (cal-tex-LaTeXify-string (calendar-day-name date)))
(cal-tex-e-makebox)
(cal-tex-nl)
(cal-tex-hspace ".4cm")
＠＠ -1422,15 +1465,17 ＠＠
"}}r＠{\\hspace{" colsep "}}r＠{\\hspace{" colsep
"}}r＠{\\hspace{" colsep "}}r＠{\\hspace{0mm}}}%\n"
"\\multicolumn{7}{c}{"
- (calendar-month-name month)
+ (cal-tex-month-name month)
" "
(int-to-string year)
"}\\\\[1mm]\n")))
(calendar-for-loop i from 0 to 6 do
- (setq str (concat str
+ (setq str
+ (concat str
+ (cal-tex-LaTeXify-string
(substring (aref calendar-day-name-array
(mod (+ calendar-week-start-day i) 7))
- 0 2)
+ 0 2))
(if (/= i 6)
" & "
"\\\\[0.7mm]\n"))))
＠＠ -1455,7 +1500,7 ＠＠
(+ (if n n 1) (calendar-absolute-from-gregorian date))))
(defun cal-tex-latexify-list (date-list date &optional separator final-separator)
- "Return string with concatenated, LaTeXified entries in DATE_LIST for DATE.
+ "Return string with concatenated, LaTeXified entries in DATE-LIST for DATE.
Use double backslash as a separator unless optional SEPARATOR is given.
If resulting string is not empty, put separator at end if optional
FINAL-SEPARATOR is t."
＠＠ -1575,6 +1620,10 ＠＠
(setq tail (substring tail 1))
(setq head (concat head (if pair (cdr pair) ch)))))
head)))
+
+(defun cal-tex-month-name (month)
+ "The name of MONTH, LaTeXified."
+ (cal-tex-LaTeXify-string (calendar-month-name month)))
(defun cal-tex-hfill () "Insert hfill." (insert "\\hfill"))
Index: cal-xemacs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/cal-xemacs.el,v
retrieving revision 1.8
diff -u -b -w -u -r1.8 cal-xemacs.el
--- cal-xemacs.el 2006/08/02 23:45:54 1.8
+++ cal-xemacs.el 2006/08/03 02:32:20
＠＠ -143,17 +143,17 ＠＠
(defconst calendar-diary-menu
'("Diary"
- ["Other file" view-other-diary-entries (calendar-cursor-to-date)]
- ["Cursor date" view-diary-entries (calendar-cursor-to-date)]
- ["Mark all" mark-diary-entries t]
- ["Show all" show-all-diary-entries t]
- ["Insert daily"insert-diary-entry t]
- ["Insert weekly" insert-weekly-diary-entry (calendar-cursor-to-date)]
- ["Insert monthly" insert-monthly-diary-entry (calendar-cursor-to-date)]
- ["Insert yearly" insert-yearly-diary-entry (calendar-cursor-to-date)]
- ["Insert anniversary" insert-anniversary-diary-entry (calendar-cursor-to-date)]
- ["Insert block" insert-block-diary-entry (calendar-cursor-to-date)]
- ["Insert cyclic" insert-cyclic-diary-entry (calendar-cursor-to-date)]
+ ["Other File" view-other-diary-entries (calendar-cursor-to-date)]
+ ["Cursor Date" view-diary-entries (calendar-cursor-to-date)]
+ ["Mark All" mark-diary-entries t]
+ ["Show All" show-all-diary-entries t]
+ ["Insert Diary Entry"insert-diary-entry t]
+ ["Insert Weekly" insert-weekly-diary-entry (calendar-cursor-to-date)]
+ ["Insert Monthly" insert-monthly-diary-entry (calendar-cursor-to-date)]
+ ["Insert Yearly" insert-yearly-diary-entry (calendar-cursor-to-date)]
+ ["Insert Anniversary" insert-anniversary-diary-entry (calendar-cursor-to-date)]
+ ["Insert Block" insert-block-diary-entry (calendar-cursor-to-date)]
+ ["Insert Cyclic" insert-cyclic-diary-entry (calendar-cursor-to-date)]
["Insert Islamic" calendar-mouse-insert-islamic-diary-entry (calendar-cursor-to-date)]
["Insert Hebrew" calendar-mouse-insert-hebrew-diary-entry (calendar-cursor-to-date)]))
Index: calendar.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/calendar.el,v
retrieving revision 1.9
diff -u -b -w -u -r1.9 calendar.el
--- calendar.el 2006/08/02 02:59:43 1.9
+++ calendar.el 2006/08/03 02:32:20
＠＠ -635,7 +635,7 ＠＠
european-date-diary-pattern
american-date-diary-pattern)
"*List of pseudo-patterns describing the forms of date used in the diary.
-The patterns on the list must be MUTUALLY EXCLUSIVE and must not match
+The patterns on the list must be MUTUALLY EXCLUSIVE and should not match
any portion of the diary entry itself, just the date component.
A pseudo-pattern is a list of regular expressions and the keywords `month',
＠＠ -1902,10 +1902,10 ＠＠
(defun generate-calendar-month (month year indent)
"Produce a calendar for MONTH, YEAR on the Gregorian calendar.
-The calendar is inserted in the buffer starting at the line on which point
-is currently located, but indented INDENT spaces. The indentation is done
-from the first character on the line and does not disturb the first INDENT
-characters on the line."
+The calendar is inserted at the top of the buffer in which point is currently
+located, but indented INDENT spaces. The indentation is done from the first
+character on the line and does not disturb the first INDENT characters on the
+line."
(let* ((blank-days;; at start of month
(mod
(- (calendar-day-of-week (list month 1 year))
＠＠ -2143,8 +2143,33 ＠＠
"\\<calendar-mode-map>\\[scroll-calendar-right]")
'help-echo "mouse-2: scroll right"
))
- "The mode line of the calendar buffer.")
+ "The mode line of the calendar buffer.
+This must be a list of items that evaluate to strings--those strings are
+evaluated and concatenated together, evenly separated by blanks. The variable
+`date' is available for use as the date under (or near) the cursor; `date'
+defaults to the current date if it is otherwise undefined. Here is an example
+value that has the Hebrew date, the day number/days remaining in the year,
+and the ISO week/year numbers in the mode. When calendar-move-hook is set to
+'update-calendar-mode-line, these mode line shows these values for the date
+under the cursor:
+
+ (list
+ \"\"
+ '(calendar-hebrew-date-string date)
+ '(let* ((year (extract-calendar-year date))
+ (d (calendar-day-number date))
+ (days-remaining
+ (- (calendar-day-number (list 12 31 year)) d)))
+ (format \"%d/%d\" d days-remaining))
+ '(let* ((d (calendar-absolute-from-gregorian date))
+ (iso-date (calendar-iso-from-absolute d)))
+ (format \"ISO week %d of %d\"
+ (extract-calendar-month iso-date)
+ (extract-calendar-year iso-date)))
+ \"\"))
+")
+
(defun calendar-goto-info-node ()
"Go to the info node for the calendar."
(interactive)
＠＠ -2222,7 +2247,12 ＠＠
(set-buffer calendar-buffer)
(setq mode-line-format
(calendar-string-spread
- calendar-mode-line-format ? (frame-width))))))
+ (let ((date (condition-case nil
+ (calendar-cursor-to-nearest-date)
+ (error (calendar-current-date)))))
+ (mapcar 'eval calendar-mode-line-format))
+ ? (frame-width)))
+ (force-mode-line-update))))
(defun calendar-window-list ()
"List of all calendar-related windows."
Index: diary-lib.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/diary-lib.el,v
retrieving revision 1.5
diff -u -b -w -u -r1.5 diary-lib.el
--- diary-lib.el 2006/07/31 02:15:23 1.5
+++ diary-lib.el 2006/08/03 02:32:20
＠＠ -265,10 +265,10 ＠＠
(if (not (looking-at "\^M\\|\n"))
(progn
(goto-char (point-max))
- (insert-string "\^M")))
+ (insert "\^M")))
(goto-char (point-min))
(if (not (looking-at "\^M\\|\n"))
- (insert-string "\^M"))
+ (insert "\^M"))
(subst-char-in-region (point-min) (point-max) ?\n ?\^M t)
(calendar-for-loop i from 1 to number do
(let ((d diary-date-forms)
＠＠ -328,9 +328,9 ＠＠
(point) ?\^M ?\n t)
(add-to-diary-list
date
- (buffer-substring-no-properties
+ (buffer-substring
entry-start (point))
- (buffer-substring-no-properties
+ (buffer-substring
(1+ date-start) (1- entry-start)) )))))
(setq d (cdr d)))
(or entry-found
＠＠ -1252,7 +1252,8 ＠＠
(defun diary-block (m1 d1 y1 m2 d2 y2)
"Block diary entry.
-Entry applies if date is between two dates. Order of the parameters is
+Entry applies if date is between, or on one of, two dates.
+The order of the parameters is
M1, D1, Y1, M2, D2, Y2 if `european-calendar-style' is nil, and
D1, M1, Y1, D2, M2, Y2 if `european-calendar-style' is t."
(let ((date1 (calendar-absolute-from-gregorian
Index: solar.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/solar.el,v
retrieving revision 1.6
diff -u -b -w -u -r1.6 solar.el
--- solar.el 2006/07/31 02:15:24 1.6
+++ solar.el 2006/08/03 02:32:20
＠＠ -200,8 +200,8 ＠＠
nil
"Sidereal time at Greenwich at midnight (universal time).")
-(defvar solar-spring-or-summer-season nil
- "T if spring or summer and nil otherwise.
+(defvar solar-northern-spring-or-summer-season nil
+ "Non-nil if northern spring or summer and nil otherwise.
Needed for polar areas, in order to know whether the day lasts 0 or 24 hours.")
(defun solar-setup ()
＠＠ -300,7 +300,7 ＠＠
(* (solar-sin-degrees obliquity)
(solar-sin-degrees longitude))))
-(defun solar-sunrise-and-sunset (time latitude longitude)
+(defun solar-sunrise-and-sunset (time latitude longitude height)
"Sunrise, sunset and length of day.
Parameters are the midday TIME and the LATITUDE, LONGITUDE of the location.
＠＠ -310,14 +310,20 ＠＠
\(-0.040945 16), -0.040945 being the number of julian centuries elapsed between
Jan 1, 2000 at 12 UT and November 28, 1995 at 0 UT.
-Coordinates are included because this function is called with latitude=10
+HEIGHT is the angle the center of the sun has over the horizon for the contact
+we are trying to find. For sunrise and sunset, it is usually -0.61 degrees,
+accounting for the edge of the sun being on the horizon.
+
+Coordinates are included because this function is called with latitude=1
degrees to find out if polar regions have 24 hours of sun or only night."
- (let* ((rise-time (solar-moment -1 latitude longitude time))
- (set-time (solar-moment 1 latitude longitude time))
+ (let* ((rise-time (solar-moment -1 latitude longitude time height))
+ (set-time (solar-moment 1 latitude longitude time height))
(day-length))
(if (not (and rise-time set-time))
- (if (or (and (> latitude 0) solar-spring-or-summer-season)
- (and (< latitude 0) (not solar-spring-or-summer-season)))
+ (if (or (and (> latitude 0)
+ solar-northern-spring-or-summer-season)
+ (and (< latitude 0)
+ (not solar-northern-spring-or-summer-season)))
(setq day-length 24)
(setq day-length 0))
(setq day-length (- set-time rise-time)))
＠＠ -325,7 +331,7 ＠＠
(if set-time (+ set-time (/ calendar-time-zone 60.0)) nil)
day-length)))
-(defun solar-moment (direction latitude longitude time)
+(defun solar-moment (direction latitude longitude time height)
"Sunrise/sunset at location.
Sunrise if DIRECTION =-1 or sunset if =1 at LATITUDE, LONGITUDE, with midday
being TIME.
＠＠ -336,9 +342,13 ＠＠
\(-0.040945 16), -0.040945 being the number of julian centuries elapsed between
Jan 1, 2000 at 12 UT and November 28, 1995 at 0 UT.
+HEIGHT is the angle the center of the sun has over the horizon for the contact
+we are trying to find. For sunrise and sunset, it is usually -0.61 degrees,
+accounting for the edge of the sun being on the horizon.
+
Uses binary search."
(let* ((ut (car (cdr time)))
- (possible 1) ; we assume that rise or set are possible
+ (possible t) ; we assume that rise or set are possible
(utmin (+ ut (* direction 12.0)))
(utmax ut) ; the time searched is between utmin and utmax
; utmin and utmax are in hours
＠＠ -354,10 +364,10 ＠＠
latitude longitude t)))))
; -0.61 degrees is the height of the middle of the sun, when it rises
; or sets.
- (if (< hmin -0.61)
- (if (> hmax -0.61)
+ (if (< hmin height)
+ (if (> hmax height)
(while ;(< i 20) ; we perform a simple dichotomy
- ;(> (abs (+ hut 0.61)) epsilon)
+ ;(> (abs (- hut height)) epsilon)
(>= (abs (- utmoment utmoment-old))
(/ solar-error 60))
(setq utmoment-old utmoment)
＠＠ -365,12 +375,12 ＠＠
(setq hut (car (cdr
(solar-horizontal-coordinates
(list t0 utmoment) latitude longitude t))))
- (if (< hut -0.61) (setq utmin utmoment))
- (if (> hut -0.61) (setq utmax utmoment))
+ (if (< hut height) (setq utmin utmoment))
+ (if (> hut height) (setq utmax utmoment))
)
- (setq possible 0)) ; the sun never rises
- (setq possible 0)) ; the sun never sets
- (if (equal possible 0) nil utmoment)))
+ (setq possible nil)) ; the sun never rises
+ (setq possible nil)) ; the sun never sets
+ (if (not possible) nil utmoment)))
(defun solar-time-string (time time-zone)
"Printable form for decimal fraction TIME in TIME-ZONE.
＠＠ -429,20 +439,20 ＠＠
(solar-sidereal-time t0))
(solar-sunrise-and-sunset
(list t0 (car (cdr exact-local-noon)))
- 10.0
- (calendar-longitude))))
+ 1.0
+ (calendar-longitude) 0)))
; store the spring/summer information,
; compute sunrise and sunset (two first components of rise-set).
; length of day is the third component (it is only the difference
; between sunset and sunrise when there is a sunset and a sunrise)
(rise-set
(progn
- (setq solar-spring-or-summer-season
- (if (> (car (cdr (cdr equator-rise-set))) 12) 1 0))
+ (setq solar-northern-spring-or-summer-season
+ (if (> (car (cdr (cdr equator-rise-set))) 12) t nil))
(solar-sunrise-and-sunset
(list t0 (car (cdr exact-local-noon)))
(calendar-latitude)
- (calendar-longitude))))
+ (calendar-longitude) -0.61)))
(rise (car rise-set))
(adj-rise (if rise (dst-adjust-time date rise) nil))
(set (car (cdr rise-set)))
＠＠ -906,6 +916,12 ＠＠
(solar-setup))
(solar-sunrise-sunset-string date))
+(defcustom diary-sabbath-candles-minutes 18
+ "*Number of minutes before sunset for sabbath candle lighting."
+:group 'diary
+:type 'integer
+:version "21.1")
+
(defun diary-sabbath-candles ()
"Local time of candle lighting diary entry--applies if date is a Friday.
No diary entry if there is no sunset on that date."
＠＠ -914,7 +930,9 ＠＠
(if (= (% (calendar-absolute-from-gregorian date) 7) 5);; Friday
(let* ((sunset (car (cdr (solar-sunrise-sunset date))))
(light (if sunset
- (cons (- (car sunset) (/ 18.0 60.0)) (cdr sunset)))))
+ (cons (- (car sunset)
+ (/ diary-sabbath-candles-minutes 60.0))
+ (cdr sunset)))))
(if sunset
(format "%s Sabbath candle lighting"
(apply 'solar-time-string light))))))
- 1 participants
- 1 comments
[Patch 21.4] native cygwin xemacs-21.4.19 segfaults when requiring un-define
17 years, 8 months
Vin Shelton
Vin Shelton
Comments?
Does anyone think the below patch will have a noticeable effect on
the speed byte compiler? Barring any concerns, I will check this in for
21.4.20.
- Vin
Aidan Kehoe <kehoea(a)parhasard.net> writes:
> Ar an t-aonú lá is triochad de mà Iúil, scrÃobh Stephen J. Turnbull:
>
> > The code at bytecode.c:1627 is the last line calling alloca_array
> > below. I wonder if maybe the compiler doesn't like the local
> > declaration of struct jump in the middle of the declarations with
> > initializations, or maybe either the compiler or cygwin.dll just
> > doesn't handle alloca_array as we expect.
>
> Thatâs it--itâs a mundane stack overflow. The length of the instructions
> string is 79648, we try to allocate twice that (= 160k) on the stack,
> Windows refuses. Mule-UCS is horrible code.
>
> The below makes (require 'un-define) work for me. Iâm not sure that it
> doesnât leak memory in the various error cases, unhappily.
>
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/bytecode.c,v
retrieving revision 1.14.2.2
diff -u -r1.14.2.2 bytecode.c
--- bytecode.c 2005/01/31 02:55:04 1.14.2.2
+++ bytecode.c 2006/07/31 10:36:05
＠＠ -1624,7 +1624,7 ＠＠
int from;
int to;
};
- struct jump * const jumps = alloca_array (struct jump, comfy_size);
+ struct jump * const jumps = xnew_array (struct jump, comfy_size);
struct jump *jumps_ptr = jumps;
Opbyte *program_ptr = program;
＠＠ -1868,6 +1868,7 ＠＠
/* *program_ptr++ = 0; */
*program_length = program_ptr - program;
+ xfree(jumps);
}
/* Optimize the byte code and store the optimized program, only
>
> --
> Santa Maradona, priez pour moi!
- 4 participants
- 6 comments
[PATCH] add Fixed to other-calendars menu
17 years, 8 months
Jeff Miller
Jeff Miller
I plan on committing this in the next day or so.
Jeff
ChangeLog addition:
2006-08-01 Jeff Miller <jeff.miller(a)xemacs.org>
* cal-xemacs.el (calendar-mouse-print-dates): Add menu entry for
Fixed (RD) date.
calendar source patch:
Diff command: cvs -q diff -uN
Files affected: cal-xemacs.el
Index: cal-xemacs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/cal-xemacs.el,v
retrieving revision 1.7
diff -u -b -w -u -r1.7 cal-xemacs.el
--- cal-xemacs.el 2006/07/31 02:38:09 1.7
+++ cal-xemacs.el 2006/08/01 23:16:39
＠＠ -480,6 +480,8 ＠＠
(calendar-julian-date-string date))
(format "Astronomical (Julian) date (before noon): %s"
(calendar-astro-date-string date))
+ (format "Fixed (RD) date: %s"
+ (calendar-absolute-from-gregorian date))
(format "Hebrew date (before sunset): %s"
(calendar-hebrew-date-string date))
(format "Persian date: %s"
- 1 participants
- 1 comments
Re: [Patch 21.4] native cygwin xemacs-21.4.19 segfaults when requiring un-define
17 years, 8 months
Aidan Kehoe
Aidan Kehoe
Ar an chéad lá de mí Lúnasa, scríobh Vin Shelton:
> > The main concern I have is that Aidan admits that the code hasn't been
> > audited for memory leaks, which is always a concern when moving from
> > alloca (which is effectively garbage-collected by the stack
> > discipline) to malloc. OTOH, byte-compilation is a very rare event;
> > any leaks probably will not be noticable.
>
> I guess I should have mentioned that I did the analysis and there are
> no alternate return paths from the particular routine in question, so
> the malloc'ed space is always free'd.
invalid_byte_code_error _is_ an alternate return path from the routine in
question, and it was that I was worried about.
> My main concern was around performance, but as you point out, the byte
> compiler is used somewhat rarely, so I guess I shouldn't worry.
Hmm--the same reasoning applies to leaking memory as a result of
invalid_byte_code_error being called before xfree(), but more so, since the
only people likely to specify invalid byte code to the interpreter are
either working on the interpreter or have just loaded a GNU Emacs
byte-compiled file.
--
Santa Maradona, priez pour moi!
- 1 participants
- 0 comments
[PACKAGES (calendar)] Remove fsf-compat dependency
17 years, 8 months
Steve Youngs
Steve Youngs
This patch removes calendar's dependence on the fsf-compat package.
Always a good thing. :-)
BTW, Jeff, I think you mentioned something about not knowing how to
get patcher to include new files...
(setq patcher-default-diff-command "cvs -q diff -uN %f")
It's all in the `N'.
calendar patch:
ChangeLog files diff command: cvs -q diff -U 0
Files affected: ChangeLog
Source files diff command: cvs -q diff -uN
Files affected: timeclock.el Makefile
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/ChangeLog,v
retrieving revision 1.31
diff -u -p -U0 -r1.31 ChangeLog
--- ChangeLog 31 Jul 2006 02:38:09 -0000 1.31
+++ ChangeLog 31 Jul 2006 06:55:25 -0000
＠＠ -0,0 +1,8 ＠＠
+2006-07-31 Steve Youngs <steve(a)sxemacs.org>
+
+ * Makefile (REQUIRES): Remove fsf-compat.
+
+ * timeclock.el (timeclock-cancel-timer): In XEmacs this is
+ `delete-itimer', in GNU/Emacs it is `cancel-timer'.
+ (timeclock-modeline-display): Use it.
+
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/Makefile,v
retrieving revision 1.30
diff -u -p -u -r1.30 Makefile
--- Makefile 31 Jul 2006 02:15:22 -0000 1.30
+++ Makefile 31 Jul 2006 06:55:16 -0000
＠＠ -22,7 +22,7 ＠＠ AUTHOR_VERSION =
MAINTAINER = Jeff Miller <jeff.miller(a)xemacs.org>
PACKAGE = calendar
PKG_TYPE = regular
-REQUIRES = xemacs-base ibuffer fsf-compat
+REQUIRES = xemacs-base ibuffer
CATEGORY = standard
include ../../Local.rules.inc
Index: timeclock.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/timeclock.el,v
retrieving revision 1.1
diff -u -p -u -r1.1 timeclock.el
--- timeclock.el 31 Jul 2006 02:15:24 -0000 1.1
+++ timeclock.el 31 Jul 2006 06:55:16 -0000
＠＠ -77,7 +77,9 ＠＠
;;; Code:
-(require 'timer)
+(if (featurep 'xemacs)
+ (defalias 'timeclock-cancel-timer 'delete-itimer)
+ (defalias 'timeclock-cancel-timer 'cancel-timer))
(defgroup timeclock nil
"Keeping track time of the time that gets spent."
＠＠ -285,7 +287,7 ＠＠ positive. Returns the new status of tim
(unless (memq 'timeclock-update-modeline timeclock-event-hook)
(add-hook 'timeclock-event-hook 'timeclock-update-modeline))
(when timeclock-update-timer
- (cancel-timer timeclock-update-timer)
+ (timeclock-cancel-timer timeclock-update-timer)
(setq timeclock-update-timer nil))
(if (boundp 'display-time-hook)
(remove-hook 'display-time-hook 'timeclock-update-modeline))
＠＠ -300,7 +302,7 ＠＠ positive. Returns the new status of tim
(remove-hook 'display-time-hook
'timeclock-update-modeline))
(when timeclock-update-timer
- (cancel-timer timeclock-update-timer)
+ (timeclock-cancel-timer timeclock-update-timer)
(setq timeclock-update-timer nil)))
(force-mode-line-update)
on-p))
--
|---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---|
| I am Dyslexic of Borg. |
| Fusistance is retile. Your arse will be laminated. |
|------------------------------------<steve(a)sxemacs.org>---|
- 2 participants
- 1 comments