diff options
author | Rasmus <rasmus@gmx.us> | 2016-05-23 09:06:56 +0200 |
---|---|---|
committer | Rasmus <rasmus@gmx.us> | 2016-05-23 09:06:56 +0200 |
commit | 9488d1309484a05b612d84f4a334219d44f93b21 (patch) | |
tree | 9a378f1147ca60ece2964aac84b14cae0b22d074 | |
parent | 8c968a9697580361ff19159bab60df132ab1bbd5 (diff) | |
parent | 6105643903b5933508f5aa296663136ec2e7ba4b (diff) | |
download | org-mode-9488d1309484a05b612d84f4a334219d44f93b21.tar.gz |
Merge branch 'maint' of orgmode.org:org-mode into maint
-rw-r--r-- | lisp/org-list.el | 10 | ||||
-rw-r--r-- | lisp/org-table.el | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lisp/org-list.el b/lisp/org-list.el index 9dbdc97..22d42a7 100644 --- a/lisp/org-list.el +++ b/lisp/org-list.el @@ -3076,10 +3076,12 @@ for this list." (catch 'exit (unless (org-at-item-p) (error "Not at a list item")) (save-excursion - (re-search-backward "#\\+ORGLST" nil t) - (unless (looking-at "\\(?:[ \t]\\)?#\\+ORGLST:[ \t]+SEND[ \t]+\\(\\S-+\\)[ \t]+\\(\\S-+\\)") - (if maybe (throw 'exit nil) - (error "Don't know how to transform this list")))) + (let ((case-fold-search t)) + (re-search-backward "^[ \t]*#\\+ORGLST:" nil t) + (unless (looking-at + "[ \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)) (transform (intern (match-string 2))) (bottom-point diff --git a/lisp/org-table.el b/lisp/org-table.el index 433b4ed..c57eb5d 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -4402,7 +4402,7 @@ to execute outside of tables." [(shift tab)] [(tab)] "\C-i")) (org-defkey orgtbl-mode-map [backspace] (orgtbl-make-binding 'org-delete-backward-char 109 - [backspace] [(del)])) + [backspace] (kbd "DEL"))) (unless (featurep 'xemacs) (org-defkey orgtbl-mode-map [S-iso-lefttab] |