summaryrefslogtreecommitdiff
path: root/lisp/calendar
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2003-02-04 13:24:35 +0000
committerJuanma Barranquero <lekktu@gmail.com>2003-02-04 13:24:35 +0000
commita1506d2977a8c2eb982ad0b59416009cdfaa6f51 (patch)
tree3cbb868ad6eb3b188d5064389538c490c124d8be /lisp/calendar
parentf1180544bb5ff44cdb45b8734734294b0a2fa7a4 (diff)
downloademacs-a1506d2977a8c2eb982ad0b59416009cdfaa6f51.tar.gz
Trailing whitepace deleted.
Diffstat (limited to 'lisp/calendar')
-rw-r--r--lisp/calendar/appt.el90
-rw-r--r--lisp/calendar/cal-china.el2
-rw-r--r--lisp/calendar/cal-coptic.el2
-rw-r--r--lisp/calendar/cal-dst.el8
-rw-r--r--lisp/calendar/cal-hebrew.el38
-rw-r--r--lisp/calendar/cal-islam.el8
-rw-r--r--lisp/calendar/cal-iso.el2
-rw-r--r--lisp/calendar/cal-julian.el4
-rw-r--r--lisp/calendar/cal-mayan.el20
-rw-r--r--lisp/calendar/cal-tex.el90
-rw-r--r--lisp/calendar/cal-x.el8
-rw-r--r--lisp/calendar/diary-lib.el2
-rw-r--r--lisp/calendar/holidays.el4
-rw-r--r--lisp/calendar/lunar.el4
-rw-r--r--lisp/calendar/solar.el58
-rw-r--r--lisp/calendar/timeclock.el2
16 files changed, 171 insertions, 171 deletions
diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index 95eaeba07ba..c3f4d77fcae 100644
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -34,36 +34,36 @@
;;; And to many others for bug fixes and suggestions.
;;;
;;;
-;;; This functions in this file will alert the user of a
+;;; This functions in this file will alert the user of a
;;; pending appointment based on their diary file.
;;;
;;; A message will be displayed in the mode line of the Emacs buffer
;;; and (if you request) the terminal will beep and display a message
-;;; from the diary in the mini-buffer, or you can choose to
+;;; from the diary in the mini-buffer, or you can choose to
;;; have a message displayed in a new buffer.
;;;
;;; The variable `appt-message-warning-time' allows the
-;;; user to specify how much notice they want before the appointment. The
+;;; user to specify how much notice they want before the appointment. The
;;; variable `appt-issue-message' specifies whether the user wants
;;; to be notified of a pending appointment.
-;;;
+;;;
;;; In order to use the appt package, you only need
;;; to load it---provided you have appointments.
;;;
;;; Before that, you can also set some options if you want
;;; (setq view-diary-entries-initially t)
;;; (setq appt-issue-message t)
-;;;
+;;;
;;; This is an example of what can be in your diary file:
;;; Monday
;;; 9:30am Coffee break
-;;; 12:00pm Lunch
-;;;
-;;; Based upon the above lines in your .emacs and diary files,
+;;; 12:00pm Lunch
+;;;
+;;; Based upon the above lines in your .emacs and diary files,
;;; the calendar and diary will be displayed when you enter
;;; Emacs and your appointments list will automatically be created.
;;; You will then be reminded at 9:20am about your coffee break
-;;; and at 11:50am to go to lunch.
+;;; and at 11:50am to go to lunch.
;;;
;;; Use describe-function on appt-check for a description of other variables
;;; that can be used to personalize the notification system.
@@ -146,7 +146,7 @@ as the first thing on a line."
;;;###autoload
(defcustom appt-display-diary t
- "*Non-nil means to display the next days diary on the screen.
+ "*Non-nil means to display the next days diary on the screen.
This will occur at midnight when the appointment list is updated."
:type 'boolean
:group 'appt)
@@ -164,13 +164,13 @@ The number before each time/message is the time in minutes from midnight.")
"*Number of minutes to wait between checking the appointment list."
:type 'integer
:group 'appt)
-
+
(defvar appt-buffer-name " *appt-buf*"
"Name of the appointments buffer.")
-
+
(defvar appt-disp-window-function 'appt-disp-window
"Function called to display appointment window.")
-
+
(defvar appt-delete-window-function 'appt-delete-window
"Function called to remove appointment window and buffer.")
@@ -192,11 +192,11 @@ Note: the time must be the first thing in the line in the diary
for a warning to be issued.
The format of the time can be either 24 hour or am/pm.
-Example:
+Example:
02/23/89
18:00 Dinner
-
+
Thursday
11:45am Lunch meeting.
@@ -231,7 +231,7 @@ The following variables control appointment notification:
Function called to display appointment window. You can customize
appt.el by setting this variable to a function different from the
one provided with this package.
-
+
`appt-delete-window-function'
Function called to remove appointment window and buffer. You can
customize appt.el by setting this variable to a function different
@@ -264,7 +264,7 @@ The following variables control appointment notification:
(cur-min (nth 1 now))
(cur-comp-time (+ (* cur-hour 60) cur-min)))
- ;; At the first check in any given day, update our
+ ;; At the first check in any given day, update our
;; appointments to today's list.
(if (or (null appt-prev-comp-time)
@@ -290,11 +290,11 @@ The following variables control appointment notification:
(let ((appt-comp-time (car (car (car appt-time-msg-list)))))
(setq min-to-app (- appt-comp-time cur-comp-time))
- (while (and appt-time-msg-list
+ (while (and appt-time-msg-list
(< appt-comp-time cur-comp-time))
- (setq appt-time-msg-list (cdr appt-time-msg-list))
+ (setq appt-time-msg-list (cdr appt-time-msg-list))
(if appt-time-msg-list
- (setq appt-comp-time
+ (setq appt-comp-time
(car (car (car appt-time-msg-list))))))
;; If we have an appointment between midnight and
@@ -302,8 +302,8 @@ The following variables control appointment notification:
;; we must begin to issue a message before midnight.
;; Midnight is considered 0 minutes and 11:59pm is
;; 1439 minutes. Therefore we must recalculate the minutes
- ;; to appointment variable. It is equal to the number of
- ;; minutes before midnight plus the number of
+ ;; to appointment variable. It is equal to the number of
+ ;; minutes before midnight plus the number of
;; minutes after midnight our appointment is.
(if (and (< appt-comp-time appt-message-warning-time)
@@ -312,7 +312,7 @@ The following variables control appointment notification:
(setq min-to-app (+ (- (1+ appt-max-time) cur-comp-time))
appt-comp-time))
- ;; issue warning if the appointment time is
+ ;; issue warning if the appointment time is
;; within appt-message-warning time
(when (and (<= min-to-app appt-message-warning-time)
@@ -337,7 +337,7 @@ The following variables control appointment notification:
;;; else
(if appt-visible
- (message "%s"
+ (message "%s"
(car (cdr (car appt-time-msg-list)))))
(if appt-audible
@@ -379,11 +379,11 @@ The following variables control appointment notification:
;; before splitting the window.
(if (equal (selected-window) (minibuffer-window))
- (if (other-window 1)
+ (if (other-window 1)
(select-window (other-window 1))
(if (display-multi-frame-p)
(select-frame (other-frame 1)))))
-
+
(let* ((this-buffer (current-buffer))
(this-window (selected-window))
(appt-disp-buf (set-buffer (get-buffer-create appt-buffer-name))))
@@ -397,7 +397,7 @@ The following variables control appointment notification:
(appt-select-lowest-window)
(split-window))
(pop-to-buffer appt-disp-buf))
- (setq mode-line-format
+ (setq mode-line-format
(concat "-------------------- Appointment in "
min-to-app " minutes. " new-time " %-"))
(erase-buffer)
@@ -408,7 +408,7 @@ The following variables control appointment notification:
(select-window this-window)
(if appt-audible
(beep 1))))
-
+
(defun appt-delete-window ()
"Function called to undisplay appointment messages.
Usually just deletes the appointment buffer."
@@ -440,12 +440,12 @@ The time should be in either 24 hour format or am/pm format."
(if (string-match "[0-9]?[0-9]:[0-9][0-9]\\(am\\|pm\\)?" new-appt-time)
nil
(error "Unacceptable time-string"))
-
+
(let* ((appt-time-string (concat new-appt-time " " new-appt-msg))
(appt-time (list (appt-convert-time new-appt-time)))
(time-msg (cons appt-time (list appt-time-string))))
(setq appt-time-msg-list (nconc appt-time-msg-list (list time-msg)))
- (setq appt-time-msg-list (appt-sort-list appt-time-msg-list))))
+ (setq appt-time-msg-list (appt-sort-list appt-time-msg-list))))
;;;###autoload
(defun appt-delete ()
@@ -454,13 +454,13 @@ The time should be in either 24 hour format or am/pm format."
(let* ((tmp-msg-list appt-time-msg-list))
(while tmp-msg-list
(let* ((element (car tmp-msg-list))
- (prompt-string (concat "Delete "
+ (prompt-string (concat "Delete "
;; We want to quote any doublequotes
;; in the string, as well as put
;; doublequotes around it.
(prin1-to-string
(substring-no-properties
- (car (cdr element)) 0))
+ (car (cdr element)) 0))
" from list? "))
(test-input (y-or-n-p prompt-string)))
(setq tmp-msg-list (cdr tmp-msg-list))
@@ -468,7 +468,7 @@ The time should be in either 24 hour format or am/pm format."
(setq appt-time-msg-list (delq element appt-time-msg-list)))))
(appt-check)
(message "")))
-
+
(eval-when-compile (defvar number)
(defvar original-date)
@@ -502,7 +502,7 @@ They specify the range of dates that the diary is being processed for."
(if diary-entries-list
;; Cycle through the entry-list (diary-entries-list)
- ;; looking for entries beginning with a time. If
+ ;; looking for entries beginning with a time. If
;; the entry begins with a time, add it to the
;; appt-time-msg-list. Then sort the list.
@@ -514,8 +514,8 @@ They specify the range of dates that the diary is being processed for."
(car entry-list) (list (calendar-current-date))))
(setq entry-list (cdr entry-list)))
;; Parse the entries for today.
- (while (and entry-list
- (calendar-date-equal
+ (while (and entry-list
+ (calendar-date-equal
(calendar-current-date) (car (car entry-list))))
(let ((time-string (cadr (car entry-list))))
(while (string-match
@@ -559,10 +559,10 @@ They specify the range of dates that the diary is being processed for."
(appt-comp-time (car (car (car appt-time-msg-list)))))
(while (and appt-time-msg-list (< appt-comp-time cur-comp-time))
- (setq appt-time-msg-list (cdr appt-time-msg-list))
+ (setq appt-time-msg-list (cdr appt-time-msg-list))
(if appt-time-msg-list
(setq appt-comp-time (car (car (car appt-time-msg-list))))))))))
-
+
(defun appt-sort-list (appt-list)
"Simple sort to put the appointments list APPT-LIST in order.
@@ -593,24 +593,24 @@ it from the original list."
(min 0))
(string-match ":\\([0-9][0-9]\\)" time2conv)
- (setq min (string-to-int
+ (setq min (string-to-int
(match-string 1 time2conv)))
-
+
(string-match "[0-9]?[0-9]:" time2conv)
- (setq hr (string-to-int
+ (setq hr (string-to-int
(match-string 0 time2conv)))
-
+
;; convert the time appointment time into 24 hour time
-
+
(cond ((and (string-match "pm" time2conv) (< hr 12))
(setq hr (+ 12 hr)))
((and (string-match "am" time2conv) (= hr 12))
(setq hr 0)))
-
+
;; convert the actual time
;; into minutes for comparison
;; against the actual time.
-
+
(setq conv-time (+ (* hr 60) min))
conv-time))
diff --git a/lisp/calendar/cal-china.el b/lisp/calendar/cal-china.el
index 473db48e09d..968926ce58a 100644
--- a/lisp/calendar/cal-china.el
+++ b/lisp/calendar/cal-china.el
@@ -57,7 +57,7 @@
(defvar chinese-calendar-terrestrial-branch
["Zi" "Chou" "Yin" "Mao" "Chen" "Si" "Wu" "Wei" "Shen" "You" "Xu" "Hai"])
-(defcustom chinese-calendar-time-zone
+(defcustom chinese-calendar-time-zone
'(if (< year 1928)
(+ 465 (/ 40.0 60.0))
480)
diff --git a/lisp/calendar/cal-coptic.el b/lisp/calendar/cal-coptic.el
index 282facef138..37d45c7ce4c 100644
--- a/lisp/calendar/cal-coptic.el
+++ b/lisp/calendar/cal-coptic.el
@@ -77,7 +77,7 @@ Gregorian date Sunday, December 31, 1 BC."
(/ year 4) ;; Leap days in prior years
(* 30 (1- month)) ;; Days in prior months this year
day))) ;; Days so far this month
-
+
(defun calendar-coptic-from-absolute (date)
"Compute the Coptic equivalent for absolute date DATE.
diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el
index f7f28be988e..2c6c2a30335 100644
--- a/lisp/calendar/cal-dst.el
+++ b/lisp/calendar/cal-dst.el
@@ -278,7 +278,7 @@ example, -300 for New York City, -480 for Los Angeles.")
(defvar calendar-daylight-time-offset
(or (car (cdr calendar-current-time-zone-cache)) 60)
"*Number of minutes difference between daylight savings and standard time.
-
+
If the locale never uses daylight savings time, set this to 0.")
(defvar calendar-standard-time-zone-name
@@ -290,7 +290,7 @@ For example, \"EST\" in New York City, \"PST\" for Los Angeles.")
(or (car (nthcdr 3 calendar-current-time-zone-cache)) "EDT")
"*Abbreviated name of daylight-savings time zone at `calendar-location-name'.
For example, \"EDT\" in New York City, \"PDT\" for Los Angeles.")
-
+
;;;###autoload
(put 'calendar-daylight-savings-starts 'risky-local-variable t)
(defvar calendar-daylight-savings-starts
@@ -331,11 +331,11 @@ For example, if daylight savings time ends on the last Sunday in October:
'(calendar-nth-named-day -1 0 10 year)
If the locale never uses daylight savings time, set this to nil.")
-
+
(defvar calendar-daylight-savings-starts-time
(or (car (nthcdr 6 calendar-current-time-zone-cache)) 120)
"*Number of minutes after midnight that daylight savings time starts.")
-
+
(defvar calendar-daylight-savings-ends-time
(or (car (nthcdr 7 calendar-current-time-zone-cache))
calendar-daylight-savings-starts-time)
diff --git a/lisp/calendar/cal-hebrew.el b/lisp/calendar/cal-hebrew.el
index 4d68a75b476..29abaebb9b4 100644
--- a/lisp/calendar/cal-hebrew.el
+++ b/lisp/calendar/cal-hebrew.el
@@ -115,9 +115,9 @@ Gregorian date Sunday, December 31, 1 BC."
day)))
(if ;; If Rosh HaShanah would occur on Sunday, Wednesday, or Friday
(memq (% alternative-day 7) (list 0 3 5))
- ;; Then postpone it one (more) day and return
+ ;; Then postpone it one (more) day and return
(1+ alternative-day)
- ;; Else return
+ ;; Else return
alternative-day)))
(defun hebrew-calendar-days-in-year (year)
@@ -316,7 +316,7 @@ nil if it is not visible in the current calendar window."
(list (calendar-gregorian-from-absolute (+ abs-r-h 22))
"Simchat Torah")))
(optional
- (list
+ (list
(list (calendar-gregorian-from-absolute
(calendar-dayname-on-or-before 6 (- abs-r-h 4)))
"Selichot (night)")
@@ -350,7 +350,7 @@ nil if it is not visible in the current calendar window."
(filter-visible-calendar-holidays mandatory)))
(if all-hebrew-calendar-holidays
(setq output-list
- (append
+ (append
(filter-visible-calendar-holidays optional)
output-list)))
output-list)))
@@ -401,7 +401,7 @@ nil if it is not visible in the current calendar window."
(list (calendar-gregorian-from-absolute (+ abs-p 50))
"Shavuot")))
(optional
- (list
+ (list
(list (calendar-gregorian-from-absolute
(calendar-dayname-on-or-before 6 (- abs-p 43)))
"Shabbat Shekalim")
@@ -467,7 +467,7 @@ nil if it is not visible in the current calendar window."
(filter-visible-calendar-holidays mandatory)))
(if all-hebrew-calendar-holidays
(setq output-list
- (append
+ (append
(filter-visible-calendar-holidays optional)
output-list)))
output-list)))
@@ -481,7 +481,7 @@ nil if it is not visible in the current calendar window."
(list 5 9 (+ displayed-year 3760)))))
(filter-visible-calendar-holidays
- (list
+ (list
(list (calendar-gregorian-from-absolute
(if (= (% abs-t-a 7) 6) (- abs-t-a 20) (- abs-t-a 21)))
"Tzom Tammuz")
@@ -513,7 +513,7 @@ not be marked in the calendar. This function is provided for use with the
(mark (regexp-quote diary-nonmarking-symbol)))
(calendar-for-loop i from 1 to number do
(let* ((d diary-date-forms)
- (hdate (calendar-hebrew-from-absolute
+ (hdate (calendar-hebrew-from-absolute
(calendar-absolute-from-gregorian gdate)))
(month (extract-calendar-month hdate))
(day (extract-calendar-day hdate))
@@ -683,7 +683,7 @@ is provided for use as part of the nongregorian-diary-marking-hook."
(setq mm 0)
(setq
mm
- (cdr
+ (cdr
(assoc-ignore-case
mm-name
(calendar-make-alist
@@ -775,7 +775,7 @@ Prefix arg will make the entry nonmarking."
(make-diary-entry
(concat
hebrew-diary-entry-symbol
- (calendar-date-string
+ (calendar-date-string
(calendar-hebrew-from-absolute
(calendar-absolute-from-gregorian
(calendar-cursor-to-date t)))
@@ -794,7 +794,7 @@ Prefix arg will make the entry nonmarking."
(make-diary-entry
(concat
hebrew-diary-entry-symbol
- (calendar-date-string
+ (calendar-date-string
(calendar-hebrew-from-absolute
(calendar-absolute-from-gregorian
(calendar-cursor-to-date t)))))
@@ -814,7 +814,7 @@ Prefix arg will make the entry nonmarking."
(make-diary-entry
(concat
hebrew-diary-entry-symbol
- (calendar-date-string
+ (calendar-date-string
(calendar-hebrew-from-absolute
(calendar-absolute-from-gregorian
(calendar-cursor-to-date t)))))
@@ -900,7 +900,7 @@ from the cursor position."
"Omer count diary entry.
Entry applies if date is within 50 days after Passover.
-An optional parameter MARK specifies a face or single-character string to
+An optional parameter MARK specifies a face or single-character string to
use when highlighting the day in the calendar."
(let* ((passover
(calendar-absolute-from-hebrew
@@ -909,7 +909,7 @@ use when highlighting the day in the calendar."
(week (/ omer 7))
(day (% omer 7)))
(if (and (> omer 0) (< omer 50))
- (cons mark
+ (cons mark
(format "Day %d%s of the omer (until sunset)"
omer
(if (zerop week)
@@ -930,7 +930,7 @@ although the date of death is specified by the civil calendar, the proper
Hebrew calendar yahrzeit is determined. If `european-calendar-style' is t, the
order of the parameters is changed to DEATH-DAY, DEATH-MONTH, DEATH-YEAR.
-An optional parameter MARK specifies a face or single-character string to
+An optional parameter MARK specifies a face or single-character string to
use when highlighting the day in the calendar."
(let* ((h-date (calendar-hebrew-from-absolute
(calendar-absolute-from-gregorian
@@ -959,7 +959,7 @@ use when highlighting the day in the calendar."
"Rosh Hodesh diary entry.
Entry applies if date is Rosh Hodesh, the day before, or the Saturday before.
-An optional parameter MARK specifies a face or single-character string to
+An optional parameter MARK specifies a face or single-character string to
use when highlighting the day in the calendar."
(let* ((d (calendar-absolute-from-gregorian date))
(h-date (calendar-hebrew-from-absolute d))
@@ -976,7 +976,7 @@ use when highlighting the day in the calendar."
(h-yesterday (extract-calendar-day
(calendar-hebrew-from-absolute (1- d)))))
(if (or (= h-day 30) (and (= h-day 1) (/= h-month 7)))
- (cons mark
+ (cons mark
(format
"Rosh Hodesh %s"
(if (= h-day 30)
@@ -990,7 +990,7 @@ use when highlighting the day in the calendar."
(format "%s (second day)" this-month)
this-month))))
(if (= (% d 7) 6) ;; Saturday--check for Shabbat Mevarchim
- (cons mark
+ (cons mark
(cond ((and (> h-day 22) (/= h-month 6) (= 29 last-day))
(format "Mevarchim Rosh Hodesh %s (%s)"
(aref h-month-names
@@ -1019,7 +1019,7 @@ use when highlighting the day in the calendar."
(defun diary-parasha (&optional mark)
"Parasha diary entry--entry applies if date is a Saturday.
-An optional parameter MARK specifies a face or single-character string to
+An optional parameter MARK specifies a face or single-character string to
use when highlighting the day in the calendar."
(let ((d (calendar-absolute-from-gregorian date)))
(if (= (% d 7) 6) ;; Saturday
diff --git a/lisp/calendar/cal-islam.el b/lisp/calendar/cal-islam.el
index ecb8aae691a..9ca2861e6b7 100644
--- a/lisp/calendar/cal-islam.el
+++ b/lisp/calendar/cal-islam.el
@@ -209,7 +209,7 @@ not be marked in the calendar. This function is provided for use with the
(mark (regexp-quote diary-nonmarking-symbol)))
(calendar-for-loop i from 1 to number do
(let* ((d diary-date-forms)
- (idate (calendar-islamic-from-absolute
+ (idate (calendar-islamic-from-absolute
(calendar-absolute-from-gregorian gdate)))
(month (extract-calendar-month idate))
(day (extract-calendar-day idate))
@@ -450,7 +450,7 @@ Prefix arg will make the entry nonmarking."
(make-diary-entry
(concat
islamic-diary-entry-symbol
- (calendar-date-string
+ (calendar-date-string
(calendar-islamic-from-absolute
(calendar-absolute-from-gregorian
(calendar-cursor-to-date t)))
@@ -468,7 +468,7 @@ Prefix arg will make the entry nonmarking."
(make-diary-entry
(concat
islamic-diary-entry-symbol
- (calendar-date-string
+ (calendar-date-string
(calendar-islamic-from-absolute
(calendar-absolute-from-gregorian
(calendar-cursor-to-date t)))))
@@ -487,7 +487,7 @@ Prefix arg will make the entry nonmarking."
(make-diary-entry
(concat
islamic-diary-entry-symbol
- (calendar-date-string
+ (calendar-date-string
(calendar-islamic-from-absolute
(calendar-absolute-from-gregorian
(calendar-cursor-to-date t)))))
diff --git a/lisp/calendar/cal-iso.el b/lisp/calendar/cal-iso.el
index 12598f1547c..97c9cbeee62 100644
--- a/lisp/calendar/cal-iso.el
+++ b/lisp/calendar/cal-iso.el
@@ -81,7 +81,7 @@ date Sunday, December 31, 1 BC."
(defun calendar-iso-date-string (&optional date)
"String of ISO date of Gregorian DATE.
Defaults to today's date if DATE is not given."
- (let* ((d (calendar-absolute-from-gregorian
+ (let* ((d (calendar-absolute-from-gregorian
(or date (calendar-current-date))))
(day (% d 7))
(iso-date (calendar-iso-from-absolute d)))
diff --git a/lisp/calendar/cal-julian.el b/lisp/calendar/cal-julian.el
index b409145fe35..830a1df143b 100644
--- a/lisp/calendar/cal-julian.el
+++ b/lisp/calendar/cal-julian.el
@@ -118,14 +118,14 @@ Driven by the variable `calendar-date-display-form'."
(mapcar 'list (append month-array nil))
nil t)
(calendar-make-alist month-array 1))))
- (last
+ (last
(if (and (zerop (% year 4)) (= month 2))
29
(aref [31 28 31 30 31 30 31 31 30 31 30 31] (1- month))))
(day (calendar-read
(format "Julian calendar day (%d-%d): "
(if (and (= year 1) (= month 1)) 3 1) last)
- '(lambda (x)
+ '(lambda (x)
(and (< (if (and (= year 1) (= month 1)) 2 0) x)
(<= x last))))))
(list (list month day year))))
diff --git a/lisp/calendar/cal-mayan.el b/lisp/calendar/cal-mayan.el
index 34401ab548b..b19d3fac014 100644
--- a/lisp/calendar/cal-mayan.el
+++ b/lisp/calendar/cal-mayan.el
@@ -137,7 +137,7 @@ but some use 1137140. Using 1232041 gives you Spinden's correlation; using
365)))
(defun calendar-next-haab-date (haab-date &optional noecho)
- "Move cursor to next instance of Mayan HAAB-DATE.
+ "Move cursor to next instance of Mayan HAAB-DATE.
Echo Mayan date if NOECHO is t."
(interactive (list (calendar-read-mayan-haab-date)))
(calendar-goto-date
@@ -149,7 +149,7 @@ Echo Mayan date if NOECHO is t."
(or noecho (calendar-print-mayan-date)))
(defun calendar-previous-haab-date (haab-date &optional noecho)
- "Move cursor to previous instance of Mayan HAAB-DATE.
+ "Move cursor to previous instance of Mayan HAAB-DATE.
Echo Mayan date if NOECHO is t."
(interactive (list (calendar-read-mayan-haab-date)))
(calendar-goto-date
@@ -199,7 +199,7 @@ Echo Mayan date if NOECHO is t."
260)))
(defun calendar-next-tzolkin-date (tzolkin-date &optional noecho)
- "Move cursor to next instance of Mayan TZOLKIN-DATE.
+ "Move cursor to next instance of Mayan TZOLKIN-DATE.
Echo Mayan date if NOECHO is t."
(interactive (list (calendar-read-mayan-tzolkin-date)))
(calendar-goto-date
@@ -211,7 +211,7 @@ Echo Mayan date if NOECHO is t."
(or noecho (calendar-print-mayan-date)))
(defun calendar-previous-tzolkin-date (tzolkin-date &optional noecho)
- "Move cursor to previous instance of Mayan TZOLKIN-DATE.
+ "Move cursor to previous instance of Mayan TZOLKIN-DATE.
Echo Mayan date if NOECHO is t."
(interactive (list (calendar-read-mayan-tzolkin-date)))
(calendar-goto-date
@@ -230,7 +230,7 @@ Echo Mayan date if NOECHO is t."
(defun calendar-mayan-tzolkin-haab-on-or-before (tzolkin-date haab-date date)
"Absolute date that is Mayan TZOLKIN-DATE and HAAB-DATE.
Latest such date on or before DATE.
-Returns nil if such a tzolkin-haab combination is impossible."
+Returns nil if such a tzolkin-haab combination is impossible."
(let* ((haab-difference
(calendar-mayan-haab-difference
(calendar-mayan-haab-from-absolute 0)
@@ -253,7 +253,7 @@ Returns nil if such a tzolkin-haab combination is impossible."
(haab-day (calendar-read
"Haab kin (0-19): "
'(lambda (x) (and (>= x 0) (< x 20)))))
- (haab-month-list (append calendar-mayan-haab-month-name-array
+ (haab-month-list (append calendar-mayan-haab-month-name-array
(and (< haab-day 5) '("Uayeb"))))
(haab-month (cdr
(assoc-ignore-case
@@ -272,7 +272,7 @@ Returns nil if such a tzolkin-haab combination is impossible."
(tzolkin-name-list (append calendar-mayan-tzolkin-names-array nil))
(tzolkin-name (cdr
(assoc-ignore-case
- (completing-read "Tzolkin uinal: "
+ (completing-read "Tzolkin uinal: "
(mapcar 'list tzolkin-name-list)
nil t)
(calendar-make-alist tzolkin-name-list 1)))))
@@ -326,7 +326,7 @@ Long count is a list (baktun katun tun uinal kin)"
(defun calendar-mayan-date-string (&optional date)
"String of Mayan date of Gregorian DATE.
Defaults to today's date if DATE is not given."
- (let* ((d (calendar-absolute-from-gregorian
+ (let* ((d (calendar-absolute-from-gregorian
(or date (calendar-current-date))))
(tzolkin (calendar-mayan-tzolkin-from-absolute d))
(haab (calendar-mayan-haab-from-absolute d))
@@ -348,7 +348,7 @@ Defaults to today's date if DATE is not given."
(let (lc)
(while (not lc)
(let ((datum
- (calendar-string-to-mayan-long-count
+ (calendar-string-to-mayan-long-count
(read-string "Mayan long count (baktun.katun.tun.uinal.kin): "
(calendar-mayan-long-count-to-string
(calendar-mayan-long-count-from-absolute
@@ -361,7 +361,7 @@ Defaults to today's date if DATE is not given."
(calendar-gregorian-from-absolute
(calendar-absolute-from-mayan-long-count date)))
(or noecho (calendar-print-mayan-date)))
-
+
(defun calendar-mayan-long-count-common-era (lc)
"T if long count represents date in the Common Era."
(let ((base (calendar-mayan-long-count-from-absolute 1)))
diff --git a/lisp/calendar/cal-tex.el b/lisp/calendar/cal-tex.el
index cbfcef69cca..cae09805e9d 100644
--- a/lisp/calendar/cal-tex.el
+++ b/lisp/calendar/cal-tex.el
@@ -48,7 +48,7 @@
(autoload 'calendar-iso-from-absolute "cal-iso" nil t)
;;;
-;;; Customizable variables
+;;; Customizable variables
;;;
(defcustom cal-tex-which-days '(0 1 2 3 4 5 6)
@@ -153,9 +153,9 @@ characters with diacritical marks to their LaTeX equivalents, use
;;;
(defvar cal-tex-day-prefix "\\caldate{%s}{%s}"
- "The initial LaTeX code for a day.
+ "The initial LaTeX code for a day.
The holidays, diary entries, bottom string, and the text follow.")
-
+
(defvar cal-tex-day-name-format "\\myday{%s}%%"
"The format for LaTeX code for a day name. The names are taken from
calendar-day-name-array.")
@@ -164,7 +164,7 @@ calendar-day-name-array.")
"\\def\\calmonth#1#2%
{\\begin{center}%
\\Huge\\bf\\uppercase{#1} #2 \\\\[1cm]%
-\\end{center}}%
+\\end{center}}%
\\vspace*{-1.5cm}%
%
"
@@ -174,7 +174,7 @@ calendar-day-name-array.")
"\\def\\calmonth#1#2#3#4%
{\\begin{center}%
\\Huge\\bf #1 #2---#3 #4\\\\[1cm]%
-\\end{center}}%
+\\end{center}}%
\\vspace*{-1.5cm}%
%
"
@@ -517,7 +517,7 @@ Calendar is condensed onto one page."
(cal-tex-end-document)))
(run-hooks 'cal-tex-hook))
-(defun cal-tex-insert-days (month year diary-list holidays day-format)
+(defun cal-tex-insert-days (month year diary-list holidays day-format)
"Insert LaTeX commands for a range of days in monthly calendars.
LaTeX commands are inserted for the days of the MONTH in YEAR.
Diary entries on DIARY-LIST are included. Holidays on HOLIDAYS are included.
@@ -532,7 +532,7 @@ Each day is formatted using format DAY-FORMAT."
(calendar-for-loop i from 1 to last do
(setq date (list month i year))
(if (memq (calendar-day-of-week date) cal-tex-which-days)
- (progn
+ (progn
(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))
@@ -549,21 +549,21 @@ Each day is formatted using format DAY-FORMAT."
"Insert the names of the days at top of a monthly calendar."
(calendar-for-loop i from 0 to 6 do
(if (memq i cal-tex-which-days)
- (insert (format cal-tex-day-name-format
+ (insert (format cal-tex-day-name-format
(cal-tex-LaTeXify-string
- (aref calendar-day-name-array
+ (aref calendar-day-name-array
(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
+A title is inserted for a calendar with N months starting with
MONTH YEAR and ending with END-MONTH END-YEAR."
(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) )
+ month-name year) )
(insert (format "\\calmonth{%s}{%s}{%s}{%s}\n\\vspace*{-0.5cm}"
month-name year end-month-name end-year))))
(cal-tex-comment))
@@ -579,7 +579,7 @@ blank, no days are inserted."
(- (calendar-day-of-week (list month 1 year))
calendar-week-start-day)
7)))
- (calendar-for-loop i from 0 to (1- blank-days) do
+ (calendar-for-loop i from 0 to (1- blank-days) do
(if (memq i cal-tex-which-days)
(insert (format day-format " " " ") "{}{}{}{}%\n"))))))
@@ -594,7 +594,7 @@ The entry is formatted using DAY-FORMAT."
(- (calendar-day-of-week (list month last-day year))
calendar-week-start-day)
7)))
- (calendar-for-loop i from (1+ blank-days) to 6 do
+ (calendar-for-loop i from (1+ blank-days) to 6 do
(if (memq i cal-tex-which-days)
(insert (format day-format "" "") "{}{}{}{}%\n"))))))
@@ -631,8 +631,8 @@ in the calendar starting in MONTH YEAR."
(defun cal-tex-number-weeks (month year n)
"Determine the number of weeks in a range of dates.
-Compute the number of weeks in the calendar starting with MONTH and YEAR,
-and lasting N months, including only the days in WHICH-DAYS. As it stands,
+Compute the number of weeks in the calendar starting with MONTH and YEAR,
+and lasting N months, including only the days in WHICH-DAYS. As it stands,
this is only an upper bound."
(let ((d (list month 1 year)))
(increment-calendar-month month year (1- n))
@@ -687,7 +687,7 @@ Holidays are included if `cal-tex-holidays' is t."
(cal-tex-e-center)
(cal-tex-hspace "-.2in")
(cal-tex-b-parbox "l" "7in")
- (calendar-for-loop j from 1 to 7 do
+ (calendar-for-loop j from 1 to 7 do
(cal-tex-week-hours date holidays "3.1")
(setq date (cal-tex-incr-date date)))
(cal-tex-e-parbox)
@@ -739,7 +739,7 @@ Holidays are included if `cal-tex-holidays' is t."
(cal-tex-e-center)
(cal-tex-hspace "-.2in")
(cal-tex-b-parbox "l" "\\textwidth")
- (calendar-for-loop j from 1 to 3 do
+ (calendar-for-loop j from 1 to 3 do
(cal-tex-week-hours date holidays "5")
(setq date (cal-tex-incr-date date)))
(cal-tex-e-parbox)
@@ -767,7 +767,7 @@ Holidays are included if `cal-tex-holidays' is t."
(insert "}")
(cal-tex-nl)
(cal-tex-b-parbox "l" "\\textwidth")
- (calendar-for-loop j from 4 to 7 do
+ (calendar-for-loop j from 4 to 7 do
(cal-tex-week-hours date holidays "5")
(setq date (cal-tex-incr-date date)))
(cal-tex-e-parbox)
@@ -825,7 +825,7 @@ Holidays are included if `cal-tex-holidays' is t."
(cal-tex-nl ".5cm")
(cal-tex-e-center)
(cal-tex-b-parbox "l" "\\textwidth")
- (calendar-for-loop j from 1 to 7 do
+ (calendar-for-loop j from 1 to 7 do
(cal-tex-b-parbox "t" "\\textwidth")
(cal-tex-b-parbox "t" "\\textwidth")
(cal-tex-rule "0pt" "\\textwidth" ".2mm")
@@ -870,13 +870,13 @@ Holidays are included if `cal-tex-holidays' is t."
(cal-tex-end-document)
(run-hooks 'cal-tex-hook)))
-(defvar cal-tex-LaTeX-hourbox
+(defvar cal-tex-LaTeX-hourbox
"\\newcommand{\\hourbox}[2]%
{\\makebox[2em]{\\rule{0cm}{#2ex}#1}\\rule{3in}{.15mm}}\n"
"One hour and a line on the right.")
(defun cal-tex-week-hours (date holidays height)
- "Insert hourly entries for DATE with HOLIDAYS, with line height HEIGHT."
+ "Insert hourly entries for DATE with HOLIDAYS, with line height HEIGHT."
(let ((month (extract-calendar-month date))
(day (extract-calendar-day date))
(year (extract-calendar-year date))
@@ -971,14 +971,14 @@ Holidays are included if `cal-tex-holidays' is t."
(calendar-for-loop i from 8 to 12 do
(insert (format "{\\large\\sf %d}\\\\\n" i)))
(calendar-for-loop i from 1 to 5 do
- (insert (format "{\\large\\sf %d}\\\\\n"
+ (insert (format "{\\large\\sf %d}\\\\\n"
(if cal-tex-24 (+ i 12) i))))))
(cal-tex-nl ".5cm")
(if weekend
(progn
(cal-tex-vspace "1cm")
(insert "\\ \\vfill")
- (insert (format "{\\Large\\bf %s,} %s/%s/%s\\\\\n"
+ (insert (format "{\\Large\\bf %s,} %s/%s/%s\\\\\n"
dayname1 month1 day1 year1))
(cal-tex-rule "0pt" "7.5cm" ".5mm")
(cal-tex-nl "1.5cm")
@@ -1070,7 +1070,7 @@ Holidays are included if `cal-tex-holidays' is t."
(cal-tex-month-name (extract-calendar-month d))
(extract-calendar-year d))))))
(insert "%\n")
- (calendar-for-loop j from 1 to 7 do
+ (calendar-for-loop j from 1 to 7 do
(if (= (mod i 2) 1)
(insert "\\rightday")
(insert "\\leftday"))
@@ -1091,7 +1091,7 @@ Holidays are included if `cal-tex-holidays' is t."
(defun cal-tex-cursor-filofax-week (&optional arg)
"One-week-at-a-glance Filofax style calendar for week indicated by cursor.
Optional prefix argument specifies number of weeks.
-Weeks start on Monday.
+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")
@@ -1179,7 +1179,7 @@ Holidays are included if `cal-tex-holidays' is t."
(cal-tex-month-name (extract-calendar-month d))
(extract-calendar-year d))))))
(insert "%\n")
- (calendar-for-loop j from 1 to 3 do
+ (calendar-for-loop j from 1 to 3 do
(insert "\\leftday")
(cal-tex-arg (cal-tex-LaTeXify-string (calendar-day-name date)))
(cal-tex-arg (int-to-string (extract-calendar-day date)))
@@ -1214,7 +1214,7 @@ Holidays are included if `cal-tex-holidays' is t."
(cal-tex-month-name (extract-calendar-month d))
(extract-calendar-year d))))))
(insert "%\n")
- (calendar-for-loop j from 1 to 2 do
+ (calendar-for-loop j from 1 to 2 do
(insert "\\rightday")
(cal-tex-arg (cal-tex-LaTeXify-string (calendar-day-name date)))
(cal-tex-arg (int-to-string (extract-calendar-day date)))
@@ -1223,7 +1223,7 @@ Holidays are included if `cal-tex-holidays' is t."
(cal-tex-arg (eval cal-tex-daily-string))
(insert "%\n")
(setq date (cal-tex-incr-date date)))
- (calendar-for-loop j from 1 to 2 do
+ (calendar-for-loop j from 1 to 2 do
(insert "\\weekend")
(cal-tex-arg (cal-tex-LaTeXify-string (calendar-day-name date)))
(cal-tex-arg (int-to-string (extract-calendar-day date)))
@@ -1241,7 +1241,7 @@ Holidays are included if `cal-tex-holidays' is t."
(defun cal-tex-cursor-filofax-daily (&optional arg)
"Day-per-page Filofax style calendar for week indicated by cursor.
-Optional prefix argument specifies number of weeks. Weeks start on Monday.
+Optional prefix argument specifies number of weeks. Weeks start on Monday.
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."
@@ -1309,7 +1309,7 @@ Pages are ruled if `cal-tex-rules' is t."
(cal-tex-b-document)
(cal-tex-cmd "\\pagestyle{empty}")
(calendar-for-loop i from 1 to n do
- (calendar-for-loop j from 1 to 5 do
+ (calendar-for-loop j from 1 to 5 do
(let ((odd (/= 0 (% j 2))))
(insert (if odd "\\righthead" "\\lefthead"))
(cal-tex-arg (calendar-date-string date))
@@ -1325,7 +1325,7 @@ Pages are ruled if `cal-tex-rules' is t."
(cal-tex-newpage)
(setq date (cal-tex-incr-date date)))
(insert "%\n")
- (calendar-for-loop j from 1 to 2 do
+ (calendar-for-loop j from 1 to 2 do
(insert "\\lefthead")
(cal-tex-arg (calendar-date-string date))
(insert "\\weekend")
@@ -1436,7 +1436,7 @@ Optional prefix argument specifies number of days."
(cal-tex-hfill)
(insert "}")
(cal-tex-banner "end of cal-tex-daily-page")))
-
+
;;;
;;; Mini calendars
;;;
@@ -1471,7 +1471,7 @@ COLSEP gives the column separation; 1mm is the default."
(setq str
(concat str
(cal-tex-LaTeXify-string
- (substring (aref calendar-day-name-array
+ (substring (aref calendar-day-name-array
(mod (+ calendar-week-start-day i) 7))
0 2))
(if (/= i 6)
@@ -1538,12 +1538,12 @@ FINAL-SEPARATOR is t."
(defun cal-tex-end-document ()
"Finish the LaTeX document.
-Insert the trailer to LaTeX document, pop to LaTeX buffer, add
+Insert the trailer to LaTeX document, pop to LaTeX buffer, add
informative header, and run HOOK."
(cal-tex-e-document)
(latex-mode)
(pop-to-buffer cal-tex-buffer)
- (goto-char (point-min))
+ (goto-char (point-min))
(cal-tex-comment " This buffer was produced by cal-tex.el.")
(cal-tex-comment " To print a calendar, type")
(cal-tex-comment " M-x tex-buffer RET")
@@ -1552,8 +1552,8 @@ informative header, and run HOOK."
(defun cal-tex-insert-preamble (weeks landscape size &optional append)
"Initialize the output buffer.
-Select the output buffer, and insert the preamble for a calendar of
-WEEKS weeks. Insert code for landscape mode if LANDSCAPE is true.
+Select the output buffer, and insert the preamble for a calendar of
+WEEKS weeks. Insert code for landscape mode if LANDSCAPE is true.
Use pointsize SIZE. Optional argument APPEND, if t, means add to end of
without erasing current contents."
(let ((width "18cm")
@@ -1565,7 +1565,7 @@ without erasing current contents."
(if (not append)
(progn
(cal-tex-preamble size)
- (if (not landscape)
+ (if (not landscape)
(progn
(cal-tex-cmd "\\oddsidemargin -1.75cm")
(cal-tex-cmd "\\def\\holidaymult{.06}"))
@@ -1583,16 +1583,16 @@ without erasing current contents."
(/ 1.1 (length cal-tex-which-days))))
(cal-tex-cmd "\\setlength{\\cellheight}" height)
(insert (format "\\setlength{\\cellheight}{%f\\cellheight}\n"
- (/ 1.0 weeks)))
+ (/ 1.0 weeks)))
(cal-tex-cmd "\\ \\par")
(cal-tex-vspace "-3cm")))
(defvar cal-tex-LaTeX-subst-list
'(("\"". "``")
("\"". "''");; Quote changes meaning when list is reversed.
- ("@" . "\\verb|@|")
- ("&" . "\\&")
- ("%" . "\\%")
+ ("@" . "\\verb|@|")
+ ("&" . "\\&")
+ ("%" . "\\%")
("$" . "\\$")
("#" . "\\#")
("_" . "\\_")
@@ -1658,11 +1658,11 @@ without erasing current contents."
(defun cal-tex-nl (&optional skip comment)
"End a line with \\. If SKIP, then add that much spacing.
Add COMMENT if present"
- (insert "\\\\")
- (if skip
+ (insert "\\\\")
+ (if skip
(insert "[" skip "]"))
(cal-tex-comment comment))
-
+
(defun cal-tex-arg (&optional text)
"Insert optional TEXT surrounded by braces."
(insert "{")
diff --git a/lisp/calendar/cal-x.el b/lisp/calendar/cal-x.el
index 3dae0e9c05b..416230ef52d 100644
--- a/lisp/calendar/cal-x.el
+++ b/lisp/calendar/cal-x.el
@@ -42,7 +42,7 @@
(defvar calendar-frame nil "Frame in which to display the calendar.")
(defvar diary-frame nil "Frame in which to display the diary.")
-
+
;; This should not specify the font. That's up to the user.
;; Certainly it should not specify auto-lower and auto-raise
;; since most users won't like that.
@@ -51,7 +51,7 @@
(unsplittable . t) (minibuffer . nil))
"Parameters of the diary frame, if the diary is in its own frame.
Location and color should be set in .Xdefaults.")
-
+
(defvar calendar-frame-parameters
'((name . "Calendar") (title . "Calendar") (minibuffer . nil)
(height . 10) (width . 80) (unsplittable . t) (vertical-scroll-bars . nil))
@@ -63,11 +63,11 @@ Location and color should be set in .Xdefaults.")
(minibuffer . nil))
"Parameters of the frame that displays both the calendar and the diary.
Location and color should be set in .Xdefaults.")
-
+
(defvar calendar-after-frame-setup-hooks nil
"Hooks to be run just after setting up a calendar frame.
Can be used to change frame parameters, such as font, color, location, etc.")
-
+
(defun calendar-one-frame-setup (&optional arg)
"Start calendar and display it in a dedicated frame together with the diary."
(if (not (display-multi-frame-p))
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index e3730614acd..f83ba4eb134 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -1721,7 +1721,7 @@ If optional NOABBREV is t, do not allow abbreviations in names."
'("[0-9]?[0-9]\\(:?[0-9][0-9]\\)?\\(am\\|pm\\|AM\\|PM\\)\\(-[0-9]?[0-9]\\(:?[0-9][0-9]\\)?\\(am\\|pm\\|AM\\|PM\\)\\)?"
. font-lock-function-name-face)))
"Forms to highlight in diary-mode")
-
+
(provide 'diary-lib)
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index debd05766a4..c6e7f11c7cf 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -149,7 +149,7 @@ The optional LABEL is used to label the buffer created."
(name (if (string-equal choice "Equinoxes/Solstices")
choice
(if (member choice '("Ask" ""))
- "Holidays"
+ "Holidays"
(format "%s Holidays" choice)))))
(list start-year end-year which name)))
(message "Computing holidays...")
@@ -466,7 +466,7 @@ date. If date is nil, or if the date is not visible, there is no holiday."
(filter-visible-calendar-holidays mandatory)))
(if all-christian-calendar-holidays
(setq output-list
- (append
+ (append
(filter-visible-calendar-holidays optional)
output-list)))
output-list)))
diff --git a/lisp/calendar/lunar.el b/lisp/calendar/lunar.el
index 2a4666ba701..011509514c0 100644
--- a/lisp/calendar/lunar.el
+++ b/lisp/calendar/lunar.el
@@ -64,7 +64,7 @@
(increment-calendar-month end-month end-year 3)
(increment-calendar-month start-month start-year -1)
(let* ((end-date (list (list end-month 1 end-year)))
- (start-date (list (list start-month
+ (start-date (list (list start-month
(calendar-last-day-of-month
start-month start-year)
start-year)))
@@ -239,7 +239,7 @@ This function is suitable for execution in a .emacs file."
(defun diary-phases-of-moon (&optional mark)
"Moon phases diary entry.
-An optional parameter MARK specifies a face or single-character string to
+An optional parameter MARK specifies a face or single-character string to
use when highlighting the day in the calendar."
(let* ((index (* 4
(truncate
diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el
index 10c385ac4a2..effccbf8b0f 100644
--- a/lisp/calendar/solar.el
+++ b/lisp/calendar/solar.el
@@ -194,8 +194,8 @@ delta. At present, delta = 0.01 degrees, so the value of the variable
'("Autumnal Equinox" "Winter Solstice" "Vernal Equinox" "Summer Solstice")
"List of season changes for the southern hemisphere.")
-(defvar solar-sidereal-time-greenwich-midnight
- nil
+(defvar solar-sidereal-time-greenwich-midnight
+ nil
"Sidereal time at Greenwich at midnight (universal time).")
(defvar solar-northern-spring-or-summer-season nil
@@ -239,7 +239,7 @@ Returns nil if nothing was entered."
(condition-case nil
(tan (degrees-to-radians (mod x 360.0)))
(solar-tangent-degrees x)))
-
+
(defun solar-xy-to-quadrant (x y)
"Determines the quadrant of the point X, Y."
(if (> x 0)
@@ -399,7 +399,7 @@ Format used is given by `calendar-time-display-form'."
(floor (* 60 (- time (floor time))))))
(defun solar-exact-local-noon (date)
- "Date and Universal Time of local noon at *local date* date.
+ "Date and Universal Time of local noon at *local date* date.
The date may be different from the one asked for, but it will be the right
local date. The second component of date should be an integer."
@@ -408,12 +408,12 @@ local date. The second component of date should be an integer."
(te (solar-time-equation date ut)))
(setq ut (- ut te))
(if (>= ut 24)
- (progn
+ (progn
(setq nd (list (car date) (+ 1 (car (cdr date)))
(car (cdr (cdr date)))))
(setq ut (- ut 24))))
(if (< ut 0)
- (progn
+ (progn
(setq nd (list (car date) (- (car (cdr date)) 1)
(car (cdr (cdr date)))))
(setq ut (+ ut 24))))
@@ -477,10 +477,10 @@ Corresponding value is nil if there is no sunrise/sunset."
(defun solar-julian-ut-centuries (date)
"Number of Julian centuries elapsed since 1 Jan, 2000 at noon U.T. for Gregorian DATE."
- (/ (- (calendar-absolute-from-gregorian date)
+ (/ (- (calendar-absolute-from-gregorian date)
(calendar-absolute-from-gregorian '(1 1.5 2000)))
36525.0))
-
+
(defun solar-ephemeris-time(time)
"Ephemeris Time at moment TIME.
@@ -534,7 +534,7 @@ calendar-time-zone are used to interpret local time."
(setq end-long long)))
(/ (+ start end) 2.0)))
-(defun solar-horizontal-coordinates
+(defun solar-horizontal-coordinates
(time latitude longitude for-sunrise-sunset)
"Azimuth and height of the sun at TIME, LATITUDE, and LONGITUDE.
@@ -557,7 +557,7 @@ The azimuth is given in degrees as well as the height (between -180 and 180)."
(* (solar-tangent-degrees de)
(solar-cosine-degrees latitude)))
(solar-sin-degrees ah)))
- (height (solar-arcsin
+ (height (solar-arcsin
(+ (* (solar-sin-degrees latitude) (solar-sin-degrees de))
(* (solar-cosine-degrees latitude)
(solar-cosine-degrees de)
@@ -573,7 +573,7 @@ elapsed at 0 Universal Time, and the second component being the universal
time. For instance, the pair corresponding to November 28, 1995 at 16 UT is
\(-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."
- (let* ((tm (solar-ephemeris-time time))
+ (let* ((tm (solar-ephemeris-time time))
(ec (solar-ecliptic-coordinates tm for-sunrise-sunset)))
(list (solar-right-ascension (car ec) (car (cdr ec)))
(solar-declination (car ec) (car (cdr ec))))))
@@ -585,16 +585,16 @@ at moment `time', expressed in julian centuries of Ephemeris Time
since January 1st, 2000, at 12 ET."
(let* ((l (+ 280.46645
(* 36000.76983 time)
- (* 0.0003032 time time))) ; sun mean longitude
+ (* 0.0003032 time time))) ; sun mean longitude
(ml (+ 218.3165
- (* 481267.8813 time))) ; moon mean longitude
+ (* 481267.8813 time))) ; moon mean longitude
(m (+ 357.52910
(* 35999.05030 time)
(* -0.0001559 time time)
- (* -0.00000048 time time time))) ; sun mean anomaly
+ (* -0.00000048 time time time))) ; sun mean anomaly
(i (+ 23.43929111 (* -0.013004167 time)
(* -0.00000016389 time time)
- (* 0.0000005036 time time time))); mean inclination
+ (* 0.0000005036 time time time))); mean inclination
(c (+ (* (+ 1.914600
(* -0.004817 time)
(* -0.000014 time time))
@@ -602,8 +602,8 @@ since January 1st, 2000, at 12 ET."
(* (+ 0.019993 (* -0.000101 time))
(solar-sin-degrees (* 2 m)))
(* 0.000290
- (solar-sin-degrees (* 3 m))))) ; center equation
- (L (+ l c)) ; total longitude
+ (solar-sin-degrees (* 3 m))))) ; center equation
+ (L (+ l c)) ; total longitude
(omega (+ 125.04
(* -1934.136 time))) ; longitude of moon's ascending node
; on the ecliptic
@@ -624,13 +624,13 @@ since January 1st, 2000, at 12 ET."
(* -0.00478
(solar-sin-degrees omega)))) ; apparent longitude of sun
(y (if (not for-sunrise-sunset)
- (* (solar-tangent-degrees (/ i 2))
+ (* (solar-tangent-degrees (/ i 2))
(solar-tangent-degrees (/ i 2)))
nil))
(time-eq (if (not for-sunrise-sunset)
(/ (* 12 (+ (* y (solar-sin-degrees (* 2 l)))
(* -2 ecc (solar-sin-degrees m))
- (* 4 ecc y (solar-sin-degrees m)
+ (* 4 ecc y (solar-sin-degrees m)
(solar-cosine-degrees (* 2 l)))
(* -0.5 y y (solar-sin-degrees (* 4 l)))
(* -1.25 ecc ecc (solar-sin-degrees (* 2 m)))))
@@ -807,7 +807,7 @@ T0 must correspond to 0 hours UT."
(nut-i (solar-ecliptic-coordinates et nil))
(nut (car (cdr (cdr (cdr nut-i))))) ; nutation
(i (car (cdr nut-i)))) ; inclination
- (mod (+ (mod (+ mean-sid-time
+ (mod (+ (mod (+ mean-sid-time
(/ (/ (* nut (solar-cosine-degrees i)) 15) 3600)) 24.0)
24.0)
24.0)))
@@ -895,7 +895,7 @@ This function is suitable for execution in a .emacs file."
"Type \\[delete-other-windows] to remove temp window."
"Type \\[switch-to-buffer] RET to remove temp window.")
"Type \\[switch-to-buffer-other-window] RET to restore old contents of temp window."))))))
-
+
(defun calendar-sunrise-sunset ()
"Local time of sunrise and sunset for date under cursor.
Accurate to a few seconds."
@@ -924,7 +924,7 @@ Accurate to a few seconds."
"Local time of candle lighting diary entry--applies if date is a Friday.
No diary entry if there is no sunset on that date.
-An optional parameter MARK specifies a face or single-character string to
+An optional parameter MARK specifies a face or single-character string to
use when highlighting the day in the calendar."
(if (not (and calendar-latitude calendar-longitude calendar-time-zone))
(solar-setup))
@@ -942,7 +942,7 @@ use when highlighting the day in the calendar."
(defun solar-equinoxes/solstices (k year)
"Date of equinox/solstice K for YEAR.
K=0, spring equinox; K=1, summer solstice; K=2, fall equinox;
-K=3, winter solstice.
+K=3, winter solstice.
RESULT is a gregorian local date.
Accurate to less than a minute between 1951 and 2050."
@@ -951,13 +951,13 @@ Accurate to less than a minute between 1951 and 2050."
(W (- (* 35999.373 T) 2.47))
(Delta-lambda (+ 1 (* 0.0334 (solar-cosine-degrees W))
(* 0.0007 (solar-cosine-degrees (* 2 W)))))
- (S (apply '+ (mapcar '(lambda(x)
- (* (car x) (solar-cosine-degrees
+ (S (apply '+ (mapcar '(lambda(x)
+ (* (car x) (solar-cosine-degrees
(+ (* (car (cdr (cdr x))) T)
- (car (cdr x))))))
+ (car (cdr x))))))
solar-seasons-data)))
(JDE (+ JDE0 (/ (* 0.00001 S) Delta-lambda)))
- (correction (+ 102.3 (* 123.5 T) (* 32.5 T T)))
+ (correction (+ 102.3 (* 123.5 T) (* 32.5 T T)))
; ephemeris time correction
(JD (- JDE (/ correction 86400)))
(date (calendar-gregorian-from-absolute (floor (- JD 1721424.5))))
@@ -969,7 +969,7 @@ Accurate to less than a minute between 1951 and 2050."
; from Meeus, 1991, page 166
(defun solar-mean-equinoxes/solstices (k year)
- "Julian day of mean equinox/solstice K for YEAR.
+ "Julian day of mean equinox/solstice K for YEAR.
K=0, spring equinox; K=1, summer solstice; K=2, fall equinox; K=3, winter
solstice. These formulas are only to be used between 1000 BC and 3000 AD."
(let ((y (/ year 1000.0))
@@ -1061,7 +1061,7 @@ Requires floating point."
(if calendar-time-zone calendar-daylight-savings-ends))
(calendar-time-zone (if calendar-time-zone calendar-time-zone 0))
(k (1- (/ m 3)))
- (d0 (solar-equinoxes/solstices k y))
+ (d0 (solar-equinoxes/solstices k y))
(d1 (list (car d0) (floor (car (cdr d0))) (car (cdr (cdr d0)))))
(h0 (* 24 (- (car (cdr d0)) (floor (car (cdr d0))))))
(adj (dst-adjust-time d1 h0))
diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el
index ced48e6fe38..2d1bd25ebec 100644
--- a/lisp/calendar/timeclock.el
+++ b/lisp/calendar/timeclock.el
@@ -125,7 +125,7 @@ If this variable is nil, no questions will be asked."
The first time that a user clocks in each day, this function will be
called to determine what the length of the current workday is. If
the return value is nil, or equal to `timeclock-workday', nothing special
-will be done. If it is a quantity different from `timeclock-workday',
+will be done. If it is a quantity different from `timeclock-workday',
however, a record will be output to the timelog file to note the fact that
that day has a different length from the norm."
:type '(choice (const nil) function)