Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2014-03-19 09:31:23 +01:00
commit 88d151b05b
1 changed files with 3 additions and 1 deletions

View File

@ -5509,7 +5509,9 @@ The following commands are available:
(unless org-inhibit-startup-visibility-stuff
(org-set-startup-visibility))))
;; Try to set org-hide correctly
(set-face-foreground 'org-hide (org-find-invisible-foreground)))
(let ((foreground (org-find-invisible-foreground)))
(if foreground
(set-face-foreground 'org-hide foreground))))
;; Update `customize-package-emacs-version-alist'
(add-to-list 'customize-package-emacs-version-alist