Browse Source

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

Rasmus 5 years ago
parent
commit
9488d13094
2 changed files with 7 additions and 5 deletions
  1. 6 4
      lisp/org-list.el
  2. 1 1
      lisp/org-table.el

+ 6 - 4
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

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