1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-04 08:47:11 +00:00
Commit Graph

1433 Commits

Author SHA1 Message Date
Glenn Morris
e9246b20af * lisp/calendar/diary-lib.el: Comment fix. 2011-06-25 15:33:29 -07:00
Glenn Morris
f6ba4cc9d8 Avoid some code duplication in diary-lib.el.
* lisp/calendar/diary-lib.el (diary-included-files): Doc fix.
(diary-include-files): New function, extracted from
diary-include-other-diary-files and diary-mark-included-diary-files.
(diary-include-other-diary-files, diary-mark-included-diary-files):
Just call diary-include-files.
(diary-mark-entries): Reset diary-included-files on first call.
2011-06-25 15:22:47 -07:00
Glenn Morris
1671230453 When marking, visit included diary-files in temp buffers.
Ref: bug#8920, but not a bug.

* lisp/calendar/diary-lib.el (diary-mark-entries)
(diary-mark-included-diary-files):
Visit included diary-files in temp buffers.
2011-06-25 15:10:21 -07:00
Martin Rudalics
39cffb4422 Restore window-safely-shrinkable-p but avoid using it in calendar.el.
* window.el (window-safely-shrinkable-p): Restore function which
was inadvertently removed in change from 2011-06-11.  Declare as
obsolete.

* calendar/calendar.el (calendar-generate-window): Use
window-iso-combined-p instead of combination of one-window-p and
window-safely-shrinkable-p.
2011-06-12 09:46:56 +02:00
Glenn Morris
0a2bb1a9cf Handle overlapping appointments in appt.el (bug#8377)
* lisp/calendar/appt.el (appt-disp-window-function): Doc fix.
(appt-check): Handle overlapping appointments.

* etc/NEWS: Mention appt-disp-window-function should handle lists now.
2011-06-11 10:54:53 -07:00
Glenn Morris
5b4d6e0e88 * lisp/calendar/appt.el (appt-mode-line): Eliminate one local variable. 2011-06-09 16:36:04 -04:00
Glenn Morris
80675c21af Eliminate some code duplication in appt.el.
* lisp/calendar/appt.el (appt-mode-line): New function.
(appt-check, appt-disp-window): Use it.
2011-06-09 16:25:34 -04:00
Glenn Morris
35d7dbd3f3 Allow some appt.el display functions to handle lists.
* lisp/calendar/appt.el (appt-display-message, appt-disp-window):
Handle lists of appointments.
2011-06-08 22:08:11 -07:00
Ivan Kanis
0de12c52c3 * lisp/calendar/appt.el (appt-check): Move some initializations into the let. 2011-06-07 23:57:38 -07:00
Glenn Morris
e565dd3789 Rationalize calendar handling of day and month abbrev-arrays.
* lisp/calendar/calendar.el (calendar-customized-p): New function.
(calendar-abbrev-construct, calendar-make-alist): Change what it does.
(calendar-day-name-array, calendar-month-name-array): Doc fix.
Add :set function.
(calendar-abbrev-length, calendar-day-abbrev-array)
(calendar-month-abbrev-array): Make defcustoms, with appropriate :set.
(calendar-day-abbrev-array, calendar-month-abbrev-array):
Elements may no longer be nil.
(calendar-day-name, calendar-month-name):
Update for changed nature of abbrev arrays.
* calendar/diary-lib.el (diary-name-pattern):
Update for changed nature of abbrev arrays.
(diary-mark-entries-1): Update calendar-make-alist calls.
(diary-font-lock-date-forms): Doc fix for changed abbrev arrays.
* calendar/cal-html.el (cal-html-day-abbrev-array):
Simply inherit from calendar-day-abbrev-array.

* etc/NEWS: Mention this.
2011-05-17 20:20:13 -07:00
Glenn Morris
7edd209389 * lisp/calendar/appt.el: Fix doc typo in previous. 2011-05-16 21:05:39 -07:00
Glenn Morris
3952e9d86c appt.el mainly doc fixes.
* lisp/calendar/appt.el (appt-message-warning-time, appt-display-mode-line)
(appt-display-diary, appt-display-interval, appt-prev-comp-time)
(appt-check): Doc fixes.
(appt-disp-window-function, appt-delete-window-function):
Remove needless special case in custom :type.
(appt-display-count): Default to 0, not nil.
(appt-check): Reset appt-display-count to 0, not nil.
2011-05-16 19:36:51 -07:00
Glenn Morris
4691905a95 appt.el trivia.
* lisp/calendar/appt.el (appt-check): Rename some local variables.
Some simplification/reordering.
2011-05-14 12:13:40 -07:00
Glenn Morris
a54640143d * calendar/appt.el (appt-check): Change mode-line message at time of the appt. 2011-05-12 18:38:31 -07:00
Glenn Morris
4accbca6e9 * lisp/calendar/appt.el (appt-time-msg-list): Doc fix. 2011-05-12 18:35:11 -07:00
Glenn Morris
5233edd7e8 * lisp/calendar/appt.el (appt-make-list): Simplify. 2011-05-12 18:31:53 -07:00
Glenn Morris
98dc3df322 appt.el code simplifications.
* lisp/calendar/appt.el (appt-now-displayed): Remove pointless variable.
(appt-check): Simplify.

Details:
appt-now-displayed was set non-nil the first time a reminder was displayed.
Nothing ever set it back to nil again.  Thus when full-check was nil,
mode-line-only was always true, so the "(when (or full-check mode-line-only)"
was pointless.  That was the only use of full-check.  mode-line-only
was only used in a negative sense, and can be reduced to the zerop test.
2011-05-12 00:56:02 -07:00
Glenn Morris
4f99f44b34 diary-lib.el doc fixes.
* lisp/calendar/diary-lib.el (diary-list-entries-hook)
(diary-mark-entries-hook, diary-nongregorian-listing-hook)
(diary-nongregorian-marking-hook, diary-list-entries)
(diary-include-other-diary-files, diary-mark-entries)
(diary-mark-included-diary-files): Doc fixes.
2011-05-09 19:22:55 -07:00
Glenn Morris
a3961c3e4d timeclock.el trivia.
* lisp/calendar/timeclock.el (timeclock-log-data): Remove unused local.
Use let rather than let*.
(timeclock-find-discrep): Remove unused local.
2011-05-06 18:24:04 -07:00
Glenn Morris
314347b9ab * lisp/calendar/diary-lib.el (diary-comment-start): Doc fix. 2011-05-06 18:20:47 -07:00
Glenn Morris
915d130021 * lisp/calendar/appt.el (appt-time-msg-list): Doc fix. 2011-05-06 18:19:27 -07:00
Glenn Morris
897f8f20a7 * lisp/calendar/diary-lib.el (diary-add-to-list): Simplify previous change. 2011-05-06 00:30:20 -07:00
Glenn Morris
5006e6344a Allow per-appointment warning times.
* lisp/calendar/appt.el (appt-message-warning-time): Doc fix.
(appt-warning-time-regexp): New option.
(appt-make-list): Respect appt-message-warning-time.

* doc/emacs/calendar.texi (Appointments): Mention appt-warning-time-regexp.

* etc/NEWS: Mention this.
2011-05-06 00:14:30 -07:00
Glenn Morris
548d0a63d6 Add diary comments feature.
* lisp/calendar/diary-lib.el (diary-comment-start, diary-comment-end):
New options.
(diary-add-to-list): Strip comments from the displayed string.
(diary-mode): Set comment-start and comment-end.

* doc/emacs/cal-xtra.texi (Fancy Diary Display): Mention diary comments.

* etc/NEWS: Mention this.
2011-05-05 21:28:53 -07:00
Glenn Morris
f330b642bb Small diary-lib.el font-locking fix.
* lisp/calendar/diary-lib.el (diary-fancy-date-pattern):
Turn it into a function, so it follows changes in calendar-date-style.
(diary-fancy-date-matcher): New function.
(diary-fancy-font-lock-keywords): Use diary-fancy-date-matcher.
(diary-fancy-font-lock-fontify-region-function):
Use diary-fancy-date-pattern as a function.
2011-05-03 19:06:28 -07:00
Glenn Morris
31dfb76ced diary-lib.el fix for bug#8583.
* lisp/calendar/diary-lib.el (diary-fancy-date-pattern):
Do not use non-numbers for `year' etc pseudo-variables.
2011-05-03 19:03:30 -07:00
Ulf Jasper
211ec9072d Applied icalendar patches from Niels Giesen.
lisp/ChangeLog:

2011-04-27  Niels Giesen <niels.giesen@gmail.com>

	* calendar/icalendar.el (diary-lib): Added require statement.
	(icalendar--create-uid): Read out a uid from a text-property on
	the first character in the entry. This allows for code to add its
	own uid to the entry.
	(icalendar--convert-float-to-ical): Add export of
	`diary-float'-entries save for those with the optional DAY
2011-04-27 19:48:35 +02:00
Glenn Morris
f195c582d8 solar.el fixes.
* lisp/calendar/solar.el (solar-horizontal-coordinates):
Use the longitude argument rather than `calendar-longitude' (15yr old bug).
(solar-date-next-longitude): Remove unused locals.
2011-04-19 19:09:06 -07:00
Glenn Morris
bc4f7f3d58 calendar housekeeping prompted by lexical-binding.
* lisp/calendar/appt.el (appt-make-list):
* lisp/calendar/cal-china.el (calendar-chinese-date-string):
* lisp/calendar/cal-hebrew.el (calendar-hebrew-list-yahrzeits)
(diary-hebrew-yahrzeit):
* lisp/calendar/cal-tex.el (cal-tex-last-blank-p, cal-tex-cursor-week2):
* lisp/calendar/calendar.el (calendar-generate-window):
* lisp/calendar/time-date.el (time-to-days):
Remove unused local variables.

* lisp/calendar/cal-dst.el (dst-adjust-time): Remove never-implemented
optional argument `style'.

* lisp/calendar/cal-tex.el (cal-tex-list-holidays, cal-tex-cursor-month)
(cal-tex-cursor-week, cal-tex-cursor-week2, cal-tex-cursor-week-iso)
(cal-tex-cursor-filofax-2week, cal-tex-cursor-filofax-week)
(cal-tex-cursor-filofax-daily, cal-tex-mini-calendar)
* lisp/calendar/cal-html.el (cal-html-insert-minical):
* lisp/calendar/diary-lib.el (diary-list-entries-1, diary-list-entries)
(calendar-mark-date-pattern):
Prefix "unused" locals.
2011-04-18 21:11:01 -07:00
Glenn Morris
4d2d1ccdbb Replace stack-trace-on-error usage in calendar.
* lisp/calendar/diary-lib.el (diary-sexp-entry):
* lisp/calendar/holidays.el (holiday-sexp):
Set debug-on-error rather than the removed stack-trace-on-error.
2011-04-16 19:11:49 -07:00
Glenn Morris
088d0d61c3 Small cal-tex fix.
* lisp/calendar/cal-tex.el (cal-tex-end-document):
Try to automatically use latin1 input if needed.
2011-04-12 00:03:52 -07:00
Glenn Morris
c0749a5133 cal-hebrew fix for diary-hebrew-rosh-hodesh.
* lisp/calendar/cal-hebrew.el (diary-hebrew-rosh-hodesh):
Don't try to cons a mark onto an empty element.

Recipe showing the problem:
~/diary:
&%%(diary-rosh-hodesh)
&%%(diary-parasha)

emacs -Q --eval "(progn (add-hook 'diary-nongregorian-listing-hook
   'diary-hebrew-list-entries) (setq cal-tex-diary t))" -f calendar

Move to Jan 2011, press `t m', latex the generated file.

[Port to 23.4]
2011-04-11 21:02:38 -07:00
Glenn Morris
3f0f17000d Calendar fix for scroll-bar scrolling (b#8305).
* lisp/calendar/cal-move.el (calendar-scroll-toolkit-scroll): New function.
* lisp/calendar/calendar.el (calendar-mode-map):
Check for toolkit scroll bars.
2011-04-05 19:05:45 -07:00
Gnus developers
1518e4f02d Merge changes made in Gnus trunk.
message.texi (Various Commands): Document format specs in the ellipsis.
time-date.el (format-seconds): Use assoc instead of assoc-string to avoid warning on XEmacs.
gnus-art.el: Require mouse, which the build bot seems to say is needed.
gravatar.el (gravatar-retrieve-synchronously): Use `url-retrieve' on XEmacs, since it doesn't have url-retrieve-synchronously.
time-date.el (format-seconds): Use assoc instead of assoc-string, since assoc-string doesn't exist in XEmacs.
gnus-group.el (gnus-group-list-ticked): New function.
 (gnus-group-make-menu-bar): Provide a menu entry for it.
 (gnus-group-list-map): Provide a binding for it.
shr.el (shr-visit-file): New command.
nnimap.el (nnimap-fetch-inbox): Rewrite slightly last patch.
nnimap.el (nnimap-fetch-inbox): Don't download bodies on ver4-capable servers.
2011-03-18 13:45:04 +00:00
Ed Reingold
e63e9234d0 cal-hebrew addition from bug#8190.
* lisp/calendar/cal-hebrew.el (diary-hebrew-yahrzeit):
Add optional `after-sunset' argument.
2011-03-06 23:48:32 -08:00
Glenn Morris
5e7a95b0f5 * lisp/calendar/cal-hebrew.el (diary-ordinal-suffix): Declare. 2011-02-28 19:53:18 -08:00
Glenn Morris
7454f2002d Rework previous cal-hebrew change.
* lisp/calendar/cal-hebrew.el (calendar-hebrew-birthday, diary-hebrew-date):
Rename and rework functions added in previous change.

* etc/NEWS: Mention diary-hebrew-birthday.
2011-02-28 19:38:41 -08:00
Ed Reingold
cdcbd5a795 Add some new cal-hebrew functions.
* lisp/calendar/cal-hebrew.el (hebrew-calendar-birthday, diary-hebrew-birthday):
New functions.
2011-02-28 19:32:05 -08:00
Glenn Morris
233ba4d924 Merge from emacs-23; up to 2010-05-26T14:19:15Z!monnier@iro.umontreal.ca. 2011-02-05 14:30:14 -08:00
Glenn Morris
9ad53e98fd diary-lib.el fix for bug#7891.
* lisp/calendar/diary-lib.el (diary-font-lock-keywords):
Tweak diary-time-regexp match.
2011-02-03 19:23:55 -08:00
Sam Steingold
abef340a0c * lisp/simple.el (special-mode-map): Bind "h" to `describe-mode';
bind "z" to `kill-this-buffer'.
(completion-list-mode-map): Bind "z" to `kill-this-buffer'.
* lisp/apropos.el (apropos-mode-map): Inherit from `special-mode-map'.
(apropos-mode): Inherit from `special-mode'.
* lisp/arc-mode.el (archive-mode-map): Inherit from `special-mode-map'.
* lisp/bookmark.el (bookmark-bmenu-mode): Define using
`define-derived-mode' inheriting from `special-mode'.
* lisp/dired.el (dired-mode-map): Inherit from `special-mode-map'.
* lisp/image-mode.el (image-mode-map): Ditto.
* lisp/replace.el (occur-mode): Define using
`define-derived-mode' inheriting from `special-mode'.
* lisp/tar-mode.el (tar-mode): Inherit from `special-mode'.
* lisp/calendar/diary-lib.el (diary-fancy-display-mode):
Inherit from `special-mode-map'.
* lisp/emacs-lisp/ert.el (ert-simple-view-mode, ert-results-mode):
Inherit from `special-mode'.
* lisp/emacs-lisp/package.el (package-menu-mode-map): Copy from
`special-mode-map'.
(package-menu-mode): Define using `define-derived-mode'
inheriting from `special-mode'.
* erc/erc-list.el (erc-list-menu-mode): Inherit from `special-mode'.
* lisp/net/xesam.el (xesam-mode): Inherit from `special-mode'.
(xesam-mode-map): Define separately.
* lisp/play/solitaire.el (solitaire-mode): Inherit from `special-mode'.
* lisp/progmodes/compile.el (compilation-minor-mode-map)
(compilation-mode-map): Inherit from `special-mode-map'.
* lisp/vc/diff-mode.el (diff-mode-shared-map):
Inherit from `special-mode-map'.
* lisp/vc/log-view.el (log-view-mode-map): Add a comment.
2011-02-01 16:22:21 -05:00
Glenn Morris
95df8112a0 Refill some long/short copyright headers. 2011-01-26 00:36:39 -08:00
Glenn Morris
73b0cd5003 Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
Glenn Morris
e9bffc61f2 Refill some copyright headers. 2011-01-15 18:21:30 -08:00
Glenn Morris
0d9f702fd0 Nuke arch-tags. 2011-01-15 15:16:57 -08:00
Stefan Monnier
77ab81d054 Merge from emacs-23 2011-01-14 12:18:41 -05:00
Stefan Monnier
7973bcea7f * lisp/calendar/diary-lib.el (diary-mode): Refresh *Calendar* after
refreshing the diary buffer.
2011-01-10 18:31:47 -05:00
Glenn Morris
5df4f04cd3 Add 2011 to FSF/AIST copyright years. 2011-01-02 15:50:46 -08:00
Stefan Monnier
f49d1f52b2 Merge from emacs-23 2010-12-13 10:27:36 -05:00
Stephen Berman
81ced43d17 diary-lib fix for bug#7536.
* lisp/calendar/diary-lib.el (diary-list-sexp-entries):
Handle case of no newline at end of file.
2010-12-08 17:50:08 -08:00