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

Merge branch 'maint' of orgmode.org:org-mode into maint

This commit is contained in:
Rasmus 2016-05-23 09:06:56 +02:00
parent 8c968a9697 6105643903
commit 9488d13094
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lisp/org-list.el
View File

@ -3076,10 +3076,12 @@ for this list."
(catch 'exit (catch 'exit
(unless (org-at-item-p) (error "Not at a list item")) (unless (org-at-item-p) (error "Not at a list item"))
(save-excursion (save-excursion
(re-search-backward "#\\+ORGLST" nil t) (let ((case-fold-search t))
(unless (looking-at "\\(?:[ \t]\\)?#\\+ORGLST:[ \t]+SEND[ \t]+\\(\\S-+\\)[ \t]+\\(\\S-+\\)") (re-search-backward "^[ \t]*#\\+ORGLST:" nil t)
(if maybe (throw 'exit nil) (unless (looking-at
(error "Don't know how to transform this list")))) "[ \t]*#\\+ORGLST:[ \t]+SEND[ \t]+\\(\\S-+\\)[ \t]+\\([^ \t\n]+\\)")
(if maybe (throw 'exit nil)
(error "Don't know how to transform this list")))))
(let* ((name (match-string 1)) (let* ((name (match-string 1))
(transform (intern (match-string 2))) (transform (intern (match-string 2)))
(bottom-point (bottom-point

2
lisp/org-table.el
View File

@ -4402,7 +4402,7 @@ to execute outside of tables."
[(shift tab)] [(tab)] "\C-i")) [(shift tab)] [(tab)] "\C-i"))
(org-defkey orgtbl-mode-map [backspace] (org-defkey orgtbl-mode-map [backspace]
(orgtbl-make-binding 'org-delete-backward-char 109 (orgtbl-make-binding 'org-delete-backward-char 109
[backspace] [(del)])) [backspace] (kbd "DEL")))
(unless (featurep 'xemacs) (unless (featurep 'xemacs)
(org-defkey orgtbl-mode-map [S-iso-lefttab] (org-defkey orgtbl-mode-map [S-iso-lefttab]