diff options
| author | Glenn Morris | 2020-02-06 07:50:29 -0800 |
|---|---|---|
| committer | Glenn Morris | 2020-02-06 07:50:29 -0800 |
| commit | 68d43392a65186a944c839dc576b2b01deafbb0d (patch) | |
| tree | 2392fb385569e10ad9d4d0ab2a48a1771131bf4e /lisp/org | |
| parent | cf14fa0427d6f490972521f7a55134e7139117c6 (diff) | |
| parent | 09eed01afb4968a93247fb8eb7b5301a5bfb6342 (diff) | |
| download | emacs-68d43392a65186a944c839dc576b2b01deafbb0d.tar.gz emacs-68d43392a65186a944c839dc576b2b01deafbb0d.zip | |
Merge from origin/emacs-27
09eed01afb Wrap some set-auto-mode calls with delay-mode-hooks (bug#3...
4a0a114505 Support ido-vertical-mode better
ef5fba9f40 Fix faces tab-bar and tab-line.
831508422e Cater for 3-argument version of pthread_setname_np
f27187f963 Clarify lexvar restrictions for add-to-ordered-list, add-t...
32763dac46 Replace add-to-list to lexical variable with push (bug#39373)
d07f177382 Clarify add-to-list documentation (bug#39373)
d3d2ea927c MH-E: alter content in mh-display-msg, not mh-show-mode
db7fa2546f Update documentation for mh-show-mode-hook
d10be6bf28 Example goto-addr hook: MH-E already uses goto-address
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp/org')
| -rw-r--r-- | lisp/org/org.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/org/org.el b/lisp/org/org.el index 1581625a8e5..e8e1ef99f26 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el | |||
| @@ -18682,13 +18682,14 @@ With prefix arg UNCOMPILED, load the uncompiled versions." | |||
| 18682 | (and (string= org-dir contrib-dir) | 18682 | (and (string= org-dir contrib-dir) |
| 18683 | (org-load-noerror-mustsuffix (concat contrib-dir f))) | 18683 | (org-load-noerror-mustsuffix (concat contrib-dir f))) |
| 18684 | (and (org-load-noerror-mustsuffix (concat (org-find-library-dir f) f)) | 18684 | (and (org-load-noerror-mustsuffix (concat (org-find-library-dir f) f)) |
| 18685 | (add-to-list 'load-uncore f 'append) | 18685 | (push f load-uncore) |
| 18686 | 't) | 18686 | 't) |
| 18687 | f)) | 18687 | f)) |
| 18688 | lfeat))) | 18688 | lfeat))) |
| 18689 | (when load-uncore | 18689 | (when load-uncore |
| 18690 | (message "The following feature%s found in load-path, please check if that's correct:\n%s" | 18690 | (message "The following feature%s found in load-path, please check if that's correct:\n%s" |
| 18691 | (if (> (length load-uncore) 1) "s were" " was") load-uncore)) | 18691 | (if (> (length load-uncore) 1) "s were" " was") |
| 18692 | (reverse load-uncore))) | ||
| 18692 | (if load-misses | 18693 | (if load-misses |
| 18693 | (message "Some error occurred while reloading Org feature%s\n%s\nPlease check *Messages*!\n%s" | 18694 | (message "Some error occurred while reloading Org feature%s\n%s\nPlease check *Messages*!\n%s" |
| 18694 | (if (> (length load-misses) 1) "s" "") load-misses (org-version nil 'full)) | 18695 | (if (> (length load-misses) 1) "s" "") load-misses (org-version nil 'full)) |