mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-25 07:02:53 +00:00
Merge branch 'maint'
Conflicts: lisp/org-clock.el lisp/org.el
This commit is contained in:
commit
bd4750f24a
|
@ -1567,12 +1567,6 @@ to, overriding the existing value of `org-clock-out-switch-to-state'."
|
||||||
(org-remove-empty-drawer-at clock-drawer (point))
|
(org-remove-empty-drawer-at clock-drawer (point))
|
||||||
(forward-line 1))))))
|
(forward-line 1))))))
|
||||||
|
|
||||||
(defun org-at-clock-log-p nil
|
|
||||||
"Is the cursor on the clock log line?"
|
|
||||||
(save-excursion
|
|
||||||
(move-beginning-of-line 1)
|
|
||||||
(looking-at "^[ \t]*CLOCK:")))
|
|
||||||
|
|
||||||
(defun org-clock-timestamps-up (&optional n)
|
(defun org-clock-timestamps-up (&optional n)
|
||||||
"Increase CLOCK timestamps at cursor.
|
"Increase CLOCK timestamps at cursor.
|
||||||
Optional argument N tells to change by that many units."
|
Optional argument N tells to change by that many units."
|
||||||
|
|
|
@ -117,7 +117,6 @@ Stars are put in group 1 and the trimmed body in group 2.")
|
||||||
(declare-function org-inlinetask-outline-regexp "org-inlinetask" ())
|
(declare-function org-inlinetask-outline-regexp "org-inlinetask" ())
|
||||||
(declare-function org-inlinetask-toggle-visibility "org-inlinetask" ())
|
(declare-function org-inlinetask-toggle-visibility "org-inlinetask" ())
|
||||||
(declare-function org-pop-to-buffer-same-window "org-compat" (&optional buffer-or-name norecord label))
|
(declare-function org-pop-to-buffer-same-window "org-compat" (&optional buffer-or-name norecord label))
|
||||||
(declare-function org-at-clock-log-p "org-clock" ())
|
|
||||||
(declare-function org-clock-get-last-clock-out-time "org-clock" ())
|
(declare-function org-clock-get-last-clock-out-time "org-clock" ())
|
||||||
(declare-function org-clock-timestamps-up "org-clock" (&optional n))
|
(declare-function org-clock-timestamps-up "org-clock" (&optional n))
|
||||||
(declare-function org-clock-timestamps-down "org-clock" (&optional n))
|
(declare-function org-clock-timestamps-down "org-clock" (&optional n))
|
||||||
|
@ -4201,6 +4200,7 @@ If TABLE-TYPE is non-nil, also check for table.el-type tables."
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(goto-char (org-table-begin 'any))
|
(goto-char (org-table-begin 'any))
|
||||||
(looking-at org-table1-hline-regexp))))
|
(looking-at org-table1-hline-regexp))))
|
||||||
|
|
||||||
(defun org-table-recognize-table.el ()
|
(defun org-table-recognize-table.el ()
|
||||||
"If there is a table.el table nearby, recognize it and move into it."
|
"If there is a table.el table nearby, recognize it and move into it."
|
||||||
(if org-table-tab-recognizes-table.el
|
(if org-table-tab-recognizes-table.el
|
||||||
|
@ -4236,7 +4236,6 @@ If TABLE-TYPE is non-nil, also check for table.el-type tables."
|
||||||
nil))
|
nil))
|
||||||
|
|
||||||
(defvar org-table-clean-did-remove-column nil)
|
(defvar org-table-clean-did-remove-column nil)
|
||||||
|
|
||||||
(defun org-table-map-tables (function &optional quietly)
|
(defun org-table-map-tables (function &optional quietly)
|
||||||
"Apply FUNCTION to the start of all tables in the buffer."
|
"Apply FUNCTION to the start of all tables in the buffer."
|
||||||
(save-excursion
|
(save-excursion
|
||||||
|
@ -16867,6 +16866,12 @@ With prefix ARG, change that many days."
|
||||||
(message "Timestamp is now %sactive"
|
(message "Timestamp is now %sactive"
|
||||||
(if (equal (char-after beg) ?<) "" "in")))))
|
(if (equal (char-after beg) ?<) "" "in")))))
|
||||||
|
|
||||||
|
(defun org-at-clock-log-p nil
|
||||||
|
"Is the cursor on the clock log line?"
|
||||||
|
(save-excursion
|
||||||
|
(move-beginning-of-line 1)
|
||||||
|
(looking-at "^[ \t]*CLOCK:")))
|
||||||
|
|
||||||
(defvar org-clock-history) ; defined in org-clock.el
|
(defvar org-clock-history) ; defined in org-clock.el
|
||||||
(defvar org-clock-adjust-closest nil) ; defined in org-clock.el
|
(defvar org-clock-adjust-closest nil) ; defined in org-clock.el
|
||||||
(defun org-timestamp-change (n &optional what updown suppress-tmp-delay)
|
(defun org-timestamp-change (n &optional what updown suppress-tmp-delay)
|
||||||
|
|
Loading…
Reference in a new issue