Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-12-20 13:16:47 +01:00
commit 5de94e46e4
8 changed files with 12 additions and 12 deletions

View File

@ -290,7 +290,7 @@ information about dblock parameters, please see the Org manual):
:summary Set to nil to turn off the final summary line."
(let ((scope (plist-get params :scope))
(org-invoice-table-params params)
(zone (move-marker (make-marker) (point)))
(zone (point-marker))
table)
(unless scope (setq scope 'default))
(unless (plist-member params :price) (plist-put params :price t))

View File

@ -2681,7 +2681,7 @@ L Timeline for current buffer # List stuck projects (!=configure)
(add-text-properties (match-beginning 2) (match-end 2)
'(face bold) header))
header)))
(setq header-end (move-marker (make-marker) (point)))
(setq header-end (point-marker))
(while t
(setq custom1 custom)
(when (eq rmheader t)

View File

@ -983,7 +983,7 @@ it. When it is a variable, retrieve the value. Return whatever we get."
(show-all)
(goto-char (org-capture-get :pos))
(org-set-local 'org-capture-target-marker
(move-marker (make-marker) (point)))
(point-marker))
(org-set-local 'outline-level 'org-outline-level)
(let* ((template (org-capture-get :template))
(type (org-capture-get :type)))

View File

@ -1393,7 +1393,7 @@ PARAMS is a property list of parameters:
:maxlevel When set to a number, don't capture headlines below this level.
:skip-empty-rows
When t, skip rows where all specifiers other than ITEM are empty."
(let ((pos (move-marker (make-marker) (point)))
(let ((pos (point-marker))
(hlines (plist-get params :hlines))
(vlines (plist-get params :vlines))
(maxlevel (plist-get params :maxlevel))

View File

@ -1242,7 +1242,7 @@ PARAMS is a property list of parameters:
:skip-empty-rows
When t, skip rows where all specifiers other than ITEM are empty.
:format When non-nil, specify the column view format to use."
(let ((pos (move-marker (make-marker) (point)))
(let ((pos (point-marker))
(hlines (plist-get params :hlines))
(vlines (plist-get params :vlines))
(maxlevel (plist-get params :maxlevel))

View File

@ -983,7 +983,7 @@ is currently a noop.")
(goto-char (point-max))
(newline)
(goto-char (point-max))
(move-marker (make-marker) (point)))))
(point-marker))))
(let ((file (match-string 1 link))
(path (match-string 2 link)))
(setq file (org-link-unescape file))

View File

@ -509,10 +509,10 @@ nil When nil, the command tries to be smart and figure out the
re)
(goto-char beg)
(beginning-of-line 1)
(setq beg (move-marker (make-marker) (point)))
(setq beg (point-marker))
(goto-char end)
(if (bolp) (backward-char 1) (end-of-line 1))
(setq end (move-marker (make-marker) (point)))
(setq end (point-marker))
;; Get the right field separator
(unless separator
(goto-char beg)
@ -1895,7 +1895,7 @@ it can be edited in place."
(if (and (boundp 'font-lock-mode) font-lock-mode)
(font-lock-fontify-block))))
(t
(let ((pos (move-marker (make-marker) (point)))
(let ((pos (point-marker))
(coord
(if (eq org-table-use-standard-references t)
(concat (org-number-to-letters (org-table-current-column))
@ -3229,7 +3229,7 @@ Parameters get priority."
(let ((key (org-table-current-field-formula 'key 'noerror))
(eql (sort (org-table-get-stored-formulas 'noerror)
'org-table-formula-less-p))
(pos (move-marker (make-marker) (point)))
(pos (point-marker))
(startline 1)
(wc (current-window-configuration))
(sel-win (selected-window))

View File

@ -11979,7 +11979,7 @@ This should be called with the cursor in a line with a statistics cookie."
(org-map-entries 'org-update-parent-todo-statistics))
(if (not (org-at-heading-p))
(org-update-checkbox-count)
(let ((pos (move-marker (make-marker) (point)))
(let ((pos (point-marker))
end l1 l2)
(ignore-errors (org-back-to-heading t))
(if (not (org-at-heading-p))
@ -15262,7 +15262,7 @@ only headings."
(setq lmin (1+ flevel) lmax (+ lmin (if org-odd-levels-only 1 0)))
(setq end (save-excursion (org-end-of-subtree t t))))
(when (org-at-heading-p)
(move-marker (make-marker) (point))))))))
(point-marker)))))))
(defun org-find-exact-headline-in-buffer (heading &optional buffer pos-only)
"Find node HEADING in BUFFER.