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

Backport Paul's fixes from Emacs trunk (2/2) 

See http://article.gmane.org/gmane.emacs.diffs/123123
This commit is contained in:
Bastien Guerry 2013-11-17 09:15:25 +01:00
parent a6210cc9c2
commit 4e798549fe
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/org.el
View File

@ -1044,7 +1044,7 @@ commands in the Help buffer using the `?' speed command."
:last-refile "org-refile-last-stored" :last-refile "org-refile-last-stored"
:last-capture-marker "org-capture-last-stored-marker") :last-capture-marker "org-capture-last-stored-marker")
"Names for bookmarks automatically set by some Org commands. "Names for bookmarks automatically set by some Org commands.
This can provide strings as names for a number of bookmakrs Org sets This can provide strings as names for a number of bookmarks Org sets
automatically. The following keys are currently implemented: automatically. The following keys are currently implemented:
:last-capture :last-capture
:last-capture-marker :last-capture-marker
@ -19521,7 +19521,7 @@ COMMANDS is a list of alternating OLDDEF NEWDEF command names."
"Transpose words for Org. "Transpose words for Org.
This uses the `org-mode-transpose-word-syntax-table' syntax This uses the `org-mode-transpose-word-syntax-table' syntax
table, which interprets characters in `org-emphasis-alist' as table, which interprets characters in `org-emphasis-alist' as
word constituants." word constituents."
(interactive) (interactive)
(with-syntax-table org-mode-transpose-word-syntax-table (with-syntax-table org-mode-transpose-word-syntax-table
(call-interactively 'transpose-words))) (call-interactively 'transpose-words)))
@ -21127,7 +21127,7 @@ With prefix arg UNCOMPILED, load the uncompiled versions."
(message "The following feature%s found in load-path, please check if that's correct:\n%s" (message "The following feature%s found in load-path, please check if that's correct:\n%s"
(if (> (length load-uncore) 1) "s were" " was") load-uncore)) (if (> (length load-uncore) 1) "s were" " was") load-uncore))
(if load-misses (if load-misses
(message "Some error occured while reloading Org feature%s\n%s\nPlease check *Messages*!\n%s" (message "Some error occurred while reloading Org feature%s\n%s\nPlease check *Messages*!\n%s"
(if (> (length load-misses) 1) "s" "") load-misses (org-version nil 'full)) (if (> (length load-misses) 1) "s" "") load-misses (org-version nil 'full))
(message "Successfully reloaded Org\n%s" (org-version nil 'full))))) (message "Successfully reloaded Org\n%s" (org-version nil 'full)))))