From 40f79f5b3c95ea15758d6cd58669860fe2d00d2b Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 24 Nov 2007 21:40:02 +0000 Subject: [PATCH] Remove leading `*' from defcustom doc-strings. (appt-disp-window): Don't require electric. Remove minibuffer-avoidance code, since appt-select-lowest-window does that. (appt-select-lowest-window): Avoid minibuffer. --- lisp/ChangeLog | 5 +++++ lisp/calendar/appt.el | 32 ++++++++++---------------------- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 207cd2ba639..b8232d98073 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,10 @@ 2007-11-24 Glenn Morris + * calendar/appt.el: Remove leading `*' from defcustom doc-strings. + (appt-disp-window): Don't require electric. Remove + minibuffer-avoidance code, since appt-select-lowest-window does that. + (appt-select-lowest-window): Avoid minibuffer. + * eshell/eshell.el: Remove leading `*' from defcustom doc-strings. (esh-mode): Require it. (esh-util): Use require rather than featurep and load. diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el index 94df068b012..0c8b9b19188 100644 --- a/lisp/calendar/appt.el +++ b/lisp/calendar/appt.el @@ -82,7 +82,7 @@ ;;;###autoload (defcustom appt-issue-message t - "*Non-nil means check for appointments in the diary buffer. + "Non-nil means check for appointments in the diary buffer. To be detected, the diary entry must have the format described in the documentation of the function `appt-check'." :type 'boolean @@ -94,19 +94,19 @@ variable `appt-display-format' instead." "22.1") ;;;###autoload (defcustom appt-message-warning-time 12 - "*Time in minutes before an appointment that the warning begins." + "Time in minutes before an appointment that the warning begins." :type 'integer :group 'appt) ;;;###autoload (defcustom appt-audible t - "*Non-nil means beep to indicate appointment." + "Non-nil means beep to indicate appointment." :type 'boolean :group 'appt) ;;;###autoload (defcustom appt-visible t - "*Non-nil means display appointment message in echo area. + "Non-nil means display appointment message in echo area. This variable is only relevant if `appt-msg-window' is nil." :type 'boolean :group 'appt) @@ -115,7 +115,7 @@ This variable is only relevant if `appt-msg-window' is nil." ;;;###autoload (defcustom appt-msg-window t - "*Non-nil means display appointment message in another window. + "Non-nil means display appointment message in another window. If non-nil, this variable overrides `appt-visible'." :type 'boolean :group 'appt) @@ -144,27 +144,27 @@ of the (obsolete) variables `appt-msg-window' and `appt-visible'." ;;;###autoload (defcustom appt-display-mode-line t - "*Non-nil means display minutes to appointment and time on the mode line. + "Non-nil means display minutes to appointment and time on the mode line. This is in addition to any other display of appointment messages." :type 'boolean :group 'appt) ;;;###autoload (defcustom appt-display-duration 10 - "*The number of seconds an appointment message is displayed. + "The number of seconds an appointment message is displayed. Only relevant if reminders are to be displayed in their own window." :type 'integer :group 'appt) ;;;###autoload (defcustom appt-display-diary t - "*Non-nil displays the diary when the appointment list is first initialized. + "Non-nil displays the diary when the appointment list is first initialized. This will occur at midnight when the appointment list is updated." :type 'boolean :group 'appt) (defcustom appt-display-interval 3 - "*Number of minutes to wait between checking the appointment list." + "Number of minutes to wait between checking the appointment list." :type 'integer :group 'appt) @@ -436,20 +436,8 @@ displayed in a window: "Display appointment message APPT-MSG in a separate buffer. The appointment is due in MIN-TO-APP (a string) minutes. NEW-TIME is a string giving the date." - (require 'electric) - - ;; Make sure we're not in the minibuffer - ;; before splitting the window. - - (if (equal (selected-window) (minibuffer-window)) - (if (other-window 1) - (select-window (other-window 1)) - (if (display-multi-frame-p) - (select-frame (other-frame 1))))) - (let ((this-window (selected-window)) (appt-disp-buf (set-buffer (get-buffer-create appt-buffer-name)))) - (if (cdr (assq 'unsplittable (frame-parameters))) ;; In an unsplittable frame, use something somewhere else. (display-buffer appt-disp-buf) @@ -489,7 +477,7 @@ Usually just deletes the appointment buffer." (let ((next-bottom-edge (nth 3 (window-edges w)))) (when (< bottom-edge next-bottom-edge) (setq bottom-edge next-bottom-edge - lowest-window w))))) + lowest-window w)))) 'nomini) (select-window lowest-window))) (defconst appt-time-regexp -- 2.39.2