summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2014-12-13 23:40:04 -0800
committerKyle Meyer <kyle@kyleam.com>2015-07-26 23:28:25 -0400
commit81272053cd8e694fcf26435f1f0c50eb193d7b26 (patch)
tree142ff1d5c75ffd6f41b00a10db01badba0ef2916
parentbfbc2bb304c2cf33a2218e7aeb4f2584a22ad523 (diff)
downloadorg-mode-81272053cd8e694fcf26435f1f0c50eb193d7b26.tar.gz
Backport commit 3de474e from Emacs master branch
Spelling fixes 3de474e4ac7418d06b9f37489f939a16d9bde1c2 Paul Eggert Sat Dec 13 23:41:33 2014 -0800
-rw-r--r--lisp/org-table.el2
-rw-r--r--lisp/org.el4
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 30a66c9..1b6a408 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -2351,7 +2351,7 @@ For all numbers larger than LIMIT, shift them by DELTA."
(string-match "^[a-zA-Z][_a-zA-Z0-9]*$" field))
(push (cons field v) org-table-local-parameters)
(push (list field line col) org-table-named-field-locations))))
- ;; Analyse the line types
+ ;; Analyze the line types.
(goto-char beg)
(setq org-table-current-begin-line (org-current-line)
org-table-current-begin-pos (point)
diff --git a/lisp/org.el b/lisp/org.el
index 3155c5a..7faea3d 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -19158,7 +19158,7 @@ BEG and END default to the buffer boundaries."
(org-defkey org-mode-map "\C-c\M-f" 'org-next-block)
(org-defkey org-mode-map "\C-c\M-b" 'org-previous-block)
(org-defkey org-mode-map "\C-c$" 'org-archive-subtree)
-(org-defkey org-mode-map "\C-c\C-x\C-s" 'org-advertized-archive-subtree)
+(org-defkey org-mode-map "\C-c\C-x\C-s" 'org-archive-subtree)
(org-defkey org-mode-map "\C-c\C-x\C-a" 'org-archive-subtree-default)
(org-defkey org-mode-map "\C-c\C-xd" 'org-insert-drawer)
(org-defkey org-mode-map "\C-c\C-xa" 'org-toggle-archive-tag)
@@ -20953,7 +20953,7 @@ on context. See the individual commands for more information."
("Archive"
["Archive (default method)" org-archive-subtree-default (org-in-subtree-not-table-p)]
"--"
- ["Move Subtree to Archive file" org-advertized-archive-subtree (org-in-subtree-not-table-p)]
+ ["Move Subtree to Archive file" org-archive-subtree (org-in-subtree-not-table-p)]
["Toggle ARCHIVE tag" org-toggle-archive-tag (org-in-subtree-not-table-p)]
["Move subtree to Archive sibling" org-archive-to-archive-sibling (org-in-subtree-not-table-p)]
)