diff options
| author | Bastien Guerry <bzg@altern.org> | 2014-03-19 09:31:23 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2014-03-19 09:31:23 +0100 |
| commit | 88d151b05bf022f933fc159023cb1f76e8740bd0 (patch) | |
| tree | 8396a0fc15fa64415e05f1e333d03509ca8e8a34 | |
| parent | 35f27a1fe568ddc98209cfc3e624f6e57bd870fa (diff) | |
| parent | 2d09804e196339ecddd7804b1386150ab43a3838 (diff) | |
| download | org-mode-88d151b05bf022f933fc159023cb1f76e8740bd0.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/org.el b/lisp/org.el index bc205f7..49ae9a6 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -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 |