0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-08-20 23:18:35 +00:00

Merge branch 'maint'

This commit is contained in:
Achim Gratz 2012-12-19 11:05:17 +01:00
commit ea5e54f93d

View file

@ -5128,13 +5128,15 @@ The following commands are available:
(defun org-find-invisible-foreground ()
(let ((candidates (remove
"unspecified-bg"
(list
(face-background 'default)
(face-background 'org-default)
(cdr (assoc 'background-color default-frame-alist))
(cdr (assoc 'background-color initial-frame-alist))
(cdr (assoc 'background-color window-system-default-frame-alist))
(face-foreground 'org-hide)))))
(nconc
(list (face-background 'default)
(face-background 'org-default))
(mapcar
(lambda (alist)
(when (boundp alist)
(cdr (assoc 'background-color (symbol-value alist)))))
'(default-frame-alist initial-frame-alist window-system-default-frame-alist))
(list (face-foreground 'org-hide))))))
(car (remove nil candidates))))
(defun org-current-time ()