aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-08-20 21:32:26 -0400
committerGlenn Morris2012-08-20 21:32:26 -0400
commit1941e1344e7c7e8f49a48faefba55e5c23c08448 (patch)
treed780f022839a2aabdc45c7ef30b4cfb962d60f37
parent891403f6d1b63dd2f82c4e67ff9a311308906f67 (diff)
downloademacs-1941e1344e7c7e8f49a48faefba55e5c23c08448.tar.gz
emacs-1941e1344e7c7e8f49a48faefba55e5c23c08448.zip
cal-tex-cursor-week-at-a-glance small fixes
* lisp/calendar/cal-tex.el (cal-tex-cursor-week-at-a-glance): Add autoload cookie. For now at least, don't use color, since no other cal-tex function does.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/calendar/cal-tex.el16
2 files changed, 12 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b3efc458149..b4ce13b3cdd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12012-08-21 Glenn Morris <rgm@gnu.org> 12012-08-21 Glenn Morris <rgm@gnu.org>
2 2
3 * calendar/cal-tex.el (cal-tex-cursor-week-at-a-glance):
4 Add autoload cookie. For now at least, don't use color, since
5 no other cal-tex function does.
6
3 * calendar/cal-tex.el (cal-tex-cursor-week-iso) 7 * calendar/cal-tex.el (cal-tex-cursor-week-iso)
4 (cal-tex-cursor-filofax-2week, cal-tex-cursor-filofax-week) 8 (cal-tex-cursor-filofax-2week, cal-tex-cursor-filofax-week)
5 (cal-tex-cursor-filofax-daily): Correct start date for diary entries. 9 (cal-tex-cursor-filofax-daily): Correct start date for diary entries.
diff --git a/lisp/calendar/cal-tex.el b/lisp/calendar/cal-tex.el
index 3063c657b93..cab3951673e 100644
--- a/lisp/calendar/cal-tex.el
+++ b/lisp/calendar/cal-tex.el
@@ -1006,12 +1006,13 @@ shown are hard-coded to 8-12, 13-17."
1006 (cal-tex-e-framebox) 1006 (cal-tex-e-framebox)
1007 (cal-tex-hspace "1cm"))) 1007 (cal-tex-hspace "1cm")))
1008 1008
1009;;;###cal-autoload
1009(defun cal-tex-cursor-week-at-a-glance (&optional n event) 1010(defun cal-tex-cursor-week-at-a-glance (&optional n event)
1010 "One-week-at-a-glance full page calendar for week indicated by cursor. 1011 "One-week-at-a-glance full page calendar for week indicated by cursor.
1011Optional prefix argument N specifies number of weeks (default 1), 1012Optional prefix argument N specifies number of weeks (default 1),
1012starting on Mondays. The calendar shows holiday and diary entries 1013starting on Mondays. The calendar shows holiday and diary entries
1013if `cal-tex-holidays' and `cal-tex-diary', respectively, are non-nil. 1014if `cal-tex-holidays' and `cal-tex-diary', respectively, are non-nil.
1014It does not show hours of the day. Optional EVENT indicates a buffer 1015It does not show hours of the day. Optional EVENT indicates a buffer
1015position to use instead of point." 1016position to use instead of point."
1016 (interactive (list (prefix-numeric-value current-prefix-arg) 1017 (interactive (list (prefix-numeric-value current-prefix-arg)
1017 last-nonmenu-event)) 1018 last-nonmenu-event))
@@ -1031,7 +1032,6 @@ position to use instead of point."
1031 (diary-list (if cal-tex-diary 1032 (diary-list (if cal-tex-diary
1032 (cal-tex-list-diary-entries d1 d2)))) 1033 (cal-tex-list-diary-entries d1 d2))))
1033 (cal-tex-preamble "twoside,12pt") 1034 (cal-tex-preamble "twoside,12pt")
1034 (cal-tex-cmd "\\usepackage{color}")
1035 (cal-tex-cmd "\\textwidth 7in") 1035 (cal-tex-cmd "\\textwidth 7in")
1036 (cal-tex-cmd "\\textheight 10.5in") 1036 (cal-tex-cmd "\\textheight 10.5in")
1037 (cal-tex-cmd "\\oddsidemargin 0in") 1037 (cal-tex-cmd "\\oddsidemargin 0in")
@@ -1047,16 +1047,16 @@ position to use instead of point."
1047 \\vbox to 2.75in{% 1047 \\vbox to 2.75in{%
1048 \\vspace*{2pt}% 1048 \\vspace*{2pt}%
1049 \\hbox to \\textwidth{\\small #5 \\hfill #1 {\\normalsize \\bf #2}}% 1049 \\hbox to \\textwidth{\\small #5 \\hfill #1 {\\normalsize \\bf #2}}%
1050 \\hbox to \\textwidth{\\vbox {\\raggedleft \\footnotesize \\em \\textcolor{red}{#4}}}% 1050 \\hbox to \\textwidth{\\vbox {\\raggedleft \\footnotesize \\em #4}}%
1051 \\hbox to \\textwidth{\\vbox to 0pt {\\noindent \\footnotesize \\textcolor{blue}{#3}}}}}\\\\} 1051 \\hbox to \\textwidth{\\vbox to 0pt {\\noindent \\footnotesize #3}}}}\\\\}
1052\\long\\def\\weekend#1#2#3#4#5{% 1052\\long\\def\\weekend#1#2#3#4#5{%
1053 \\rule{\\textwidth}{0.3pt}\\\\% 1053 \\rule{\\textwidth}{0.3pt}\\\\%
1054 \\hbox to \\textwidth{% 1054 \\hbox to \\textwidth{%
1055 \\vbox to 1.8in{% 1055 \\vbox to 1.8in{%
1056 \\vspace*{2pt}% 1056 \\vspace*{2pt}%
1057 \\hbox to \\textwidth{\\small #5 \\hfill #1 {\\normalsize \\bf #2}}% 1057 \\hbox to \\textwidth{\\small #5 \\hfill #1 {\\normalsize \\bf #2}}%
1058 \\hbox to \\textwidth{\\vbox {\\raggedleft \\footnotesize \\em \\textcolor{red}{#4}}}% 1058 \\hbox to \\textwidth{\\vbox {\\raggedleft \\footnotesize \\em #4}}%
1059 \\hbox to \\textwidth{\\vbox to 0pt {\\noindent \\footnotesize \\textcolor{blue}{#3}}}}}\\\\} 1059 \\hbox to \\textwidth{\\vbox to 0pt {\\noindent \\footnotesize #3}}}}\\\\}
1060\\def\\lefthead#1{\\noindent {\\normalsize \\bf #1}\\hfill\\\\[-6pt]} 1060\\def\\lefthead#1{\\noindent {\\normalsize \\bf #1}\\hfill\\\\[-6pt]}
1061\\long\\def\\leftday#1#2#3#4#5{% 1061\\long\\def\\leftday#1#2#3#4#5{%
1062 \\rule{\\textwidth}{0.3pt}\\\\% 1062 \\rule{\\textwidth}{0.3pt}\\\\%
@@ -1064,8 +1064,8 @@ position to use instead of point."
1064 \\vbox to 2.75in{% 1064 \\vbox to 2.75in{%
1065 \\vspace*{2pt}% 1065 \\vspace*{2pt}%
1066 \\hbox to \\textwidth{\\noindent {\\normalsize \\bf #2} \\small #1 \\hfill #5}% 1066 \\hbox to \\textwidth{\\noindent {\\normalsize \\bf #2} \\small #1 \\hfill #5}%
1067 \\hbox to \\textwidth{\\vbox {\\noindent \\footnotesize \\em \\textcolor{red}{#4}}}% 1067 \\hbox to \\textwidth{\\vbox {\\noindent \\footnotesize \\em #4}}%
1068 \\hbox to \\textwidth{\\vbox to 0pt {\\noindent \\footnotesize \\textcolor{blue}{#3}}}}}\\\\} 1068 \\hbox to \\textwidth{\\vbox to 0pt {\\noindent \\footnotesize #3}}}}\\\\}
1069") 1069")
1070 (cal-tex-b-document) 1070 (cal-tex-b-document)
1071 (cal-tex-cmd "\\pagestyle{empty}\\ ") 1071 (cal-tex-cmd "\\pagestyle{empty}\\ ")