Explorar o código

Backport commit 3de474e from Emacs master branch

Spelling fixes
3de474e4ac7418d06b9f37489f939a16d9bde1c2
Paul Eggert
Sat Dec 13 23:41:33 2014 -0800
Paul Eggert %!s(int64=10) %!d(string=hai) anos
pai
achega
81272053cd
Modificáronse 2 ficheiros con 3 adicións e 3 borrados
  1. 1 1
      lisp/org-table.el
  2. 2 2
      lisp/org.el

+ 1 - 1
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)

+ 2 - 2
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)]
      )