forked from mirrors/org-mode
Merge branch 'bugfix'
This commit is contained in:
commit
1a6d5f11d0
27
lisp/org.el
27
lisp/org.el
|
@ -10226,7 +10226,7 @@ nil."
|
||||||
(replace-match "")
|
(replace-match "")
|
||||||
(if (and (string-match "\\S-" (buffer-substring (line-beginning-position) (point)))
|
(if (and (string-match "\\S-" (buffer-substring (line-beginning-position) (point)))
|
||||||
(equal (char-before) ?\ ))
|
(equal (char-before) ?\ ))
|
||||||
(backward-delete-char 1)
|
(delete-char -1)
|
||||||
(when (string-match "^[ \t]*$" (buffer-substring
|
(when (string-match "^[ \t]*$" (buffer-substring
|
||||||
(line-beginning-position) (line-end-position)))
|
(line-beginning-position) (line-end-position)))
|
||||||
(delete-region (line-beginning-position)
|
(delete-region (line-beginning-position)
|
||||||
|
@ -12017,18 +12017,17 @@ Returns the new tags string, or nil to not change the current settings."
|
||||||
(setq current nil)
|
(setq current nil)
|
||||||
(when exit-after-next (setq exit-after-next 'now)))
|
(when exit-after-next (setq exit-after-next 'now)))
|
||||||
((= c ?\t)
|
((= c ?\t)
|
||||||
(condition-case nil
|
(unless tab-tags
|
||||||
(unless tab-tags
|
(setq tab-tags
|
||||||
(setq tab-tags
|
(delq nil
|
||||||
(delq nil
|
(mapcar (lambda (x)
|
||||||
(mapcar (lambda (x)
|
(let ((item (car-safe x)))
|
||||||
(let ((item (car-safe x)))
|
(and (stringp item)
|
||||||
(and (stringp item)
|
(list item))))
|
||||||
(list item))))
|
(org--tag-add-to-alist
|
||||||
(org--tag-add-to-alist
|
(with-current-buffer buf
|
||||||
(with-current-buffer buf
|
(org-get-buffer-tags))
|
||||||
(org-get-buffer-tags))
|
table)))))
|
||||||
table))))))
|
|
||||||
(setq tg (completing-read "Tag: " tab-tags))
|
(setq tg (completing-read "Tag: " tab-tags))
|
||||||
(when (string-match "\\S-" tg)
|
(when (string-match "\\S-" tg)
|
||||||
(cl-pushnew (list tg) tab-tags :test #'equal)
|
(cl-pushnew (list tg) tab-tags :test #'equal)
|
||||||
|
@ -16530,7 +16529,7 @@ because, in this case the deletion might narrow the column."
|
||||||
(looking-at-p ".*?|")
|
(looking-at-p ".*?|")
|
||||||
(org-at-table-p))
|
(org-at-table-p))
|
||||||
(progn (forward-char -1) (org-delete-char 1))
|
(progn (forward-char -1) (org-delete-char 1))
|
||||||
(backward-delete-char N)
|
(funcall-interactively #'backward-delete-char N)
|
||||||
(org-fix-tags-on-the-fly))))
|
(org-fix-tags-on-the-fly))))
|
||||||
|
|
||||||
(defun org-delete-char (N)
|
(defun org-delete-char (N)
|
||||||
|
|
Loading…
Reference in New Issue