소스 검색

Maintenance: Include changes from downstream Emacs

Carsten Dominik 16 년 전
부모
커밋
7b061f4329
2개의 변경된 파일4개의 추가작업 그리고 3개의 파일을 삭제
  1. 2 2
      lisp/org-list.el
  2. 2 1
      lisp/org-table.el

+ 2 - 2
lisp/org-list.el

@@ -89,7 +89,7 @@ the bullet in each item of he list."
 
 (defcustom org-empty-line-terminates-plain-lists nil
   "Non-nil means, an empty line ends all plain list levels.
-When nil, empty lines are part of the preceeding item."
+When nil, empty lines are part of the preceding item."
   :group 'org-plain-lists
   :type 'boolean)
 
@@ -253,7 +253,7 @@ Return t when things worked, nil when we are not in an item."
 With prefix arg TOGGLE-PRESENCE, add or remove checkboxes.
 When there is an active region, toggle status or presence of the checkbox
 in the first line, and make every item in the region have the same
-status or precence, respectively.
+status or presence, respectively.
 If the cursor is in a headline, apply this to all checkbox items in the
 text below the heading."
   (interactive "P")

+ 2 - 1
lisp/org-table.el

@@ -40,7 +40,8 @@
   (require 'cl))
 (require 'org)
 
-(declare-function org-table-clean-before-export "org-exp" (lines))
+(declare-function org-table-clean-before-export "org-exp"
+		  (lines &optional maybe-quoted))
 (declare-function org-format-org-table-html "org-exp" (lines &optional splice))
 (defvar orgtbl-mode) ; defined below
 (defvar orgtbl-mode-menu) ; defined when orgtbl mode get initialized