Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2013-07-01 00:36:17 +02:00
commit 2ccd6d9887
4 changed files with 24 additions and 21 deletions

View File

@ -70,14 +70,14 @@ this function is called."
(*orgtbl-default-fmt* 'orgtbl-sql-strip-and-quote)
(params2
(list
:sqlname name
:sqlname (plist-get params :sqlname)
:tstart (lambda () (concat (if nowebname
(format "<<%s>>= \n" nowebname)
"")
"BEGIN TRANSACTION;"))
:tend (lambda () (concat "COMMIT;" (if nowebname "\n@ " "")))
:hfmt (lambda (f) (progn (if firstheader (push f hdrlist)) ""))
:hlfmt (lambda (lst) (setq firstheader nil))
:hfmt (lambda (f) (progn (if firstheader (push f hdrlist) "")))
:hlfmt (lambda (&rest cells) (setq firstheader nil))
:lstart (lambda () (concat "INSERT INTO "
sqlname "( "
(mapconcat 'identity (reverse hdrlist)

View File

@ -3130,11 +3130,12 @@ longer string it is used as a tags/todo match string.
Parameters are alternating variable names and values that will be bound
before running the agenda command."
(org-eval-in-environment (org-make-parameter-alist parameters)
(if (> (length cmd-key) 2)
(org-tags-view nil cmd-key)
(org-agenda nil cmd-key)))
(set-buffer org-agenda-buffer-name)
(princ (buffer-string)))
(let (org-agenda-sticky)
(if (> (length cmd-key) 2)
(org-tags-view nil cmd-key)
(org-agenda nil cmd-key)))
(set-buffer org-agenda-buffer-name)
(princ (buffer-string))))
(defvar org-agenda-info nil)

View File

@ -8196,8 +8196,8 @@ This is a short-hand for marking the subtree and then cutting it."
(org-copy-subtree n 'cut))
(defun org-copy-subtree (&optional n cut force-store-markers nosubtrees)
"Cut the current subtree into the clipboard.
With prefix arg N, cut this many sequential subtrees.
"Copy the current subtree it in the clipboard.
With prefix arg N, copy this many sequential subtrees.
This is a short-hand for marking the subtree and then copying it.
If CUT is non-nil, actually cut the subtree.
If FORCE-STORE-MARKERS is non-nil, store the relative locations
@ -11617,7 +11617,9 @@ prefix argument (`C-u C-u C-u C-c C-w')."
(unless org-refile-keep
(if regionp
(delete-region (point) (+ (point) region-length))
(org-cut-subtree)))
(delete-region
(point-at-bol)
(min (buffer-size) (1+ (org-end-of-subtree t))))))
(when (featurep 'org-inlinetask)
(org-inlinetask-remove-END-maybe))
(setq org-markers-to-move nil)

View File

@ -2800,16 +2800,12 @@ the plist used as a communication channel."
;;;; Plain List
;; FIXME Maybe arg1 is not needed because <li value="20"> already sets
;; the correct value for the item counter
(defun org-html-begin-plain-list (type &optional arg1)
(defun org-html-begin-plain-list (type ordered-num)
"Insert the beginning of the HTML list depending on TYPE.
When ARG1 is a string, use it as the start parameter for ordered
lists."
If ORDERED-NUM is nil, the list order is alphabetical."
(case type
(ordered
(format "<ol class=\"org-ol\"%s>"
(if arg1 (format " start=\"%d\"" arg1) "")))
(ordered (format "<ol class=\"org-ol\"%s>"
(if ordered-num "" " type=\"a\"")))
(unordered "<ul class=\"org-ul\">")
(descriptive "<dl class=\"org-dl\">")))
@ -2824,10 +2820,14 @@ lists."
"Transcode a PLAIN-LIST element from Org to HTML.
CONTENTS is the contents of the list. INFO is a plist holding
contextual information."
(let* (arg1 ;; (assoc :counter (org-element-map plain-list 'item
(let* ((ordered-num
(org-element-map plain-list 'item
(lambda (i)
(null (string-to-number (org-element-property :bullet i))))
info 'first-match))
(type (org-element-property :type plain-list)))
(format "%s\n%s%s"
(org-html-begin-plain-list type)
(org-html-begin-plain-list type ordered-num)
contents (org-html-end-plain-list type))))
;;;; Plain Text