Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

solar.el: Tweak sunrise-sunset output

Browse source 
* lisp/calendar/solar.el (solar-sunrise-sunset-string): Shorten message a bit.
(sunrise-sunset): Use message rather than a window.

Fixes: debbugs:19859
This commit is contained in:
Glenn Morris 2015-02-19 22:24:34 -08:00
parent 4fa6da01eb
commit 98cb7d9e4d
2 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,5 +1,9 @@
2015-02-20 Glenn Morris <rgm@gnu.org>
* calendar/solar.el (solar-sunrise-sunset-string):
Shorten message a little.
(sunrise-sunset): Use message rather than a window. (Bug#19859)
* progmodes/f90.el (f90-keywords-re, f90-procedures-re)
(f90-font-lock-keywords-2): Some F2008 additions.

22
lisp/calendar/solar.el
View file

@ -657,7 +657,7 @@ Corresponding value is nil if there is no sunrise/sunset."
Optional NOLOCATION non-nil means do not print the location."
(let ((l (solar-sunrise-sunset date)))
(format
"%s, %s%s (%s hours daylight)"
"%s, %s%s (%s hrs daylight)"
(if (car l)
(concat "Sunrise " (apply 'solar-time-string (car l)))
"No sunrise")
@ -847,20 +847,12 @@ This function is suitable for execution in an init file."
(date (if (< arg 4) (calendar-current-date) (calendar-read-date)))
(date-string (calendar-date-string date t))
(time-string (solar-sunrise-sunset-string date))
(msg (format "%s: %s" date-string time-string))
(one-window (one-window-p t)))
(if (<= (length msg) (frame-width))
(message "%s" msg)
(with-output-to-temp-buffer "*temp*"
(princ (concat date-string "\n" time-string)))
(message "%s"
(substitute-command-keys
(if one-window
(if pop-up-windows
"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."))))))
(msg (format "%s%s"
(if (< arg 4) "" ; don't print date if it's today's
(format "%s: " date-string))
time-string)))
(message "%s" msg)
msg))
;;;###cal-autoload
(defun calendar-sunrise-sunset (&optional event)