Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
75762c68
Commit
75762c68
authored
Mar 14, 2008
by
Glenn Morris
Browse files
(mark-diary-entries): Move some constant variables outside the
diary-date-forms loop.
parent
ef473719
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
11 deletions
+18
-11
lisp/ChangeLog
lisp/ChangeLog
+7
-0
lisp/calendar/diary-lib.el
lisp/calendar/diary-lib.el
+11
-11
No files found.
lisp/ChangeLog
View file @
75762c68
...
...
@@ -3,6 +3,13 @@
* startup.el (command-line-1): Rename -internal-script back to
-scriptload (reverts previous change).
* calendar/cal-coptic.el (coptic-calendar-month-name-array):
(ethiopic-calendar-month-name-array, ethiopic-name): Add doc strings.
(coptic-prompt-for-date): Move definition before use.
* calendar/diary-lib.el (mark-diary-entries): Move some constant
variables outside the diary-date-forms loop.
* calendar/calendar.el (diary-file): Doc fix.
(calendar-buffer-list): Return buffers rather than strings (fixes
previous change).
...
...
lisp/calendar/diary-lib.el
View file @
75762c68
...
...
@@ -1094,6 +1094,16 @@ diary entries."
(setq mark-diary-entries-in-calendar nil)
(redraw-calendar))
(let ((marking-diary-entries t)
(dayname
(diary-name-pattern calendar-day-name-array
calendar-day-abbrev-array))
(monthname
(format "%s\\|\\*
"
(diary-name-pattern calendar-month-name-array
calendar-month-abbrev-array)))
(month "
[0-9]+\\|\\*")
(day "[0-9]+\\|\\*
")
(year "
[0-9]+\\|\\*")
file-glob-attrs marks)
(with-current-buffer (find-file-noselect (diary-check-diary-file) t)
(save-excursion
...
...
@@ -1105,17 +1115,7 @@ diary entries."
(dolist (date-form diary-date-forms)
(if (eq (car date-form) 'backup)
(setq date-form (cdr date-form))) ; ignore 'backup directive
(let* ((dayname
(diary-name-pattern calendar-day-name-array
calendar-day-abbrev-array))
(monthname
(format "%s\\|\\*
"
(diary-name-pattern calendar-month-name-array
calendar-month-abbrev-array)))
(month "
[0-9]+\\|\\*")
(day "[0-9]+\\|\\*
")
(year "
[0-9]+\\|\\*")
(l (length date-form))
(let* ((l (length date-form))
(d-name-pos (- l (length (memq 'dayname date-form))))
(d-name-pos (if (/= l d-name-pos) (+ 1 d-name-pos)))
(m-name-pos (- l (length (memq 'monthname date-form))))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment