ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-09-28 18:05:46 +02:00
parent 55436135e7 ecdc4d14c8
commit cf5281297b
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lisp/org.el
View File

@ -5144,14 +5144,7 @@ The following commands are available:
(unless org-inhibit-startup-visibility-stuff (unless org-inhibit-startup-visibility-stuff
(org-set-startup-visibility))) (org-set-startup-visibility)))
;; Try to set org-hide correctly ;; Try to set org-hide correctly
(set-face-foreground (set-face-foreground 'org-hide (org-find-invisible-foreground)))
'org-hide
(or (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))))
(when (fboundp 'abbrev-table-put) (when (fboundp 'abbrev-table-put)
(abbrev-table-put org-mode-abbrev-table (abbrev-table-put org-mode-abbrev-table
@ -5159,6 +5152,19 @@ The following commands are available:
(put 'org-mode 'flyspell-mode-predicate 'org-mode-flyspell-verify) (put 'org-mode 'flyspell-mode-predicate 'org-mode-flyspell-verify)
(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)))))
(car (remove nil candidates))))
(defun org-current-time () (defun org-current-time ()
"Current time, possibly rounded to `org-time-stamp-rounding-minutes'." "Current time, possibly rounded to `org-time-stamp-rounding-minutes'."
(if (> (car org-time-stamp-rounding-minutes) 1) (if (> (car org-time-stamp-rounding-minutes) 1)