Don't use `org-labels'
* org-compat.el (org-labels): Remove. * org-bibtex.el (org-bibtex-headline): Don't use `org-labels'. * ob.el (org-babel-sha1-hash, org-babel-noweb-p): Ditto.
This commit is contained in:
parent
ae21293a2e
commit
ba16c3c6f5
20
lisp/ob.el
20
lisp/ob.el
|
@ -1024,11 +1024,11 @@ the current subtree."
|
||||||
(setf (nth 2 info)
|
(setf (nth 2 info)
|
||||||
(sort (copy-sequence (nth 2 info))
|
(sort (copy-sequence (nth 2 info))
|
||||||
(lambda (a b) (string< (car a) (car b)))))
|
(lambda (a b) (string< (car a) (car b)))))
|
||||||
(org-labels ((rm (lst)
|
(let* ((rm (lambda (lst)
|
||||||
(dolist (p '("replace" "silent" "append" "prepend"))
|
(dolist (p '("replace" "silent" "append" "prepend"))
|
||||||
(setq lst (remove p lst)))
|
(setq lst (remove p lst)))
|
||||||
lst)
|
lst))
|
||||||
(norm (arg)
|
(norm (lambda (arg)
|
||||||
(let ((v (if (and (listp (cdr arg)) (null (cddr arg)))
|
(let ((v (if (and (listp (cdr arg)) (null (cddr arg)))
|
||||||
(copy-sequence (cdr arg))
|
(copy-sequence (cdr arg))
|
||||||
(cdr arg))))
|
(cdr arg))))
|
||||||
|
@ -1038,19 +1038,19 @@ the current subtree."
|
||||||
(cond
|
(cond
|
||||||
((and (listp v) ; lists are sorted
|
((and (listp v) ; lists are sorted
|
||||||
(member (car arg) '(:result-params)))
|
(member (car arg) '(:result-params)))
|
||||||
(sort (rm v) #'string<))
|
(sort (funcall rm v) #'string<))
|
||||||
((and (stringp v) ; strings are sorted
|
((and (stringp v) ; strings are sorted
|
||||||
(member (car arg) '(:results :exports)))
|
(member (car arg) '(:results :exports)))
|
||||||
(mapconcat #'identity (sort (rm (split-string v))
|
(mapconcat #'identity (sort (funcall rm (split-string v))
|
||||||
#'string<) " "))
|
#'string<) " "))
|
||||||
(t v))))))
|
(t v)))))))
|
||||||
((lambda (hash)
|
((lambda (hash)
|
||||||
(when (org-called-interactively-p 'interactive) (message hash)) hash)
|
(when (org-called-interactively-p 'interactive) (message hash)) hash)
|
||||||
(let ((it (format "%s-%s"
|
(let ((it (format "%s-%s"
|
||||||
(mapconcat
|
(mapconcat
|
||||||
#'identity
|
#'identity
|
||||||
(delq nil (mapcar (lambda (arg)
|
(delq nil (mapcar (lambda (arg)
|
||||||
(let ((normalized (norm arg)))
|
(let ((normalized (funcall norm arg)))
|
||||||
(when normalized
|
(when normalized
|
||||||
(format "%S" normalized))))
|
(format "%S" normalized))))
|
||||||
(nth 2 info))) ":")
|
(nth 2 info))) ":")
|
||||||
|
@ -2223,12 +2223,12 @@ header argument from buffer or subtree wide properties.")
|
||||||
(defun org-babel-noweb-p (params context)
|
(defun org-babel-noweb-p (params context)
|
||||||
"Check if PARAMS require expansion in CONTEXT.
|
"Check if PARAMS require expansion in CONTEXT.
|
||||||
CONTEXT may be one of :tangle, :export or :eval."
|
CONTEXT may be one of :tangle, :export or :eval."
|
||||||
(org-labels ((intersect (as bs)
|
(letrec ((intersect (lambda (as bs)
|
||||||
(when as
|
(when as
|
||||||
(if (member (car as) bs)
|
(if (member (car as) bs)
|
||||||
(car as)
|
(car as)
|
||||||
(intersect (cdr as) bs)))))
|
(funcall intersect (cdr as) bs))))))
|
||||||
(intersect (case context
|
(funcall intersect (case context
|
||||||
(:tangle '("yes" "tangle" "no-export" "strip-export"))
|
(:tangle '("yes" "tangle" "no-export" "strip-export"))
|
||||||
(:eval '("yes" "no-export" "strip-export" "eval"))
|
(:eval '("yes" "no-export" "strip-export" "eval"))
|
||||||
(:export '("yes")))
|
(:export '("yes")))
|
||||||
|
|
|
@ -309,16 +309,15 @@ This variable is relevant only if `org-bibtex-export-tags-as-keywords` is t."
|
||||||
|
|
||||||
(defun org-bibtex-headline ()
|
(defun org-bibtex-headline ()
|
||||||
"Return a bibtex entry of the given headline as a string."
|
"Return a bibtex entry of the given headline as a string."
|
||||||
(org-labels
|
(letrec ((val (lambda (key lst) (cdr (assoc key lst))))
|
||||||
((val (key lst) (cdr (assoc key lst)))
|
(to (lambda (string) (intern (concat ":" string))))
|
||||||
(to (string) (intern (concat ":" string)))
|
(from (lambda (key) (substring (symbol-name key) 1)))
|
||||||
(from (key) (substring (symbol-name key) 1))
|
(flatten (lambda (&rest lsts)
|
||||||
(flatten (&rest lsts)
|
|
||||||
(apply #'append (mapcar
|
(apply #'append (mapcar
|
||||||
(lambda (e)
|
(lambda (e)
|
||||||
(if (listp e) (apply #'flatten e) (list e)))
|
(if (listp e) (apply flatten e) (list e)))
|
||||||
lsts))))
|
lsts))))
|
||||||
(let ((notes (buffer-string))
|
(notes (buffer-string))
|
||||||
(id (org-bibtex-get org-bibtex-key-property))
|
(id (org-bibtex-get org-bibtex-key-property))
|
||||||
(type (org-bibtex-get org-bibtex-type-property-name))
|
(type (org-bibtex-get org-bibtex-type-property-name))
|
||||||
(tags (when org-bibtex-tags-are-keywords
|
(tags (when org-bibtex-tags-are-keywords
|
||||||
|
@ -354,13 +353,13 @@ This variable is relevant only if `org-bibtex-export-tags-as-keywords` is t."
|
||||||
(org-entry-properties nil 'standard))
|
(org-entry-properties nil 'standard))
|
||||||
(mapcar
|
(mapcar
|
||||||
(lambda (field)
|
(lambda (field)
|
||||||
(let ((value (or (org-bibtex-get (from field))
|
(let ((value (or (org-bibtex-get (funcall from field))
|
||||||
(and (equal :title field)
|
(and (equal :title field)
|
||||||
(nth 4 (org-heading-components))))))
|
(nth 4 (org-heading-components))))))
|
||||||
(when value (cons (from field) value))))
|
(when value (cons (funcall from field) value))))
|
||||||
(flatten
|
(funcall flatten
|
||||||
(val :required (val (to type) org-bibtex-types))
|
(funcall val :required (funcall val (funcall to type) org-bibtex-types))
|
||||||
(val :optional (val (to type) org-bibtex-types))))))
|
(funcall val :optional (funcall val (funcall to type) org-bibtex-types))))))
|
||||||
",\n"))))
|
",\n"))))
|
||||||
(with-temp-buffer
|
(with-temp-buffer
|
||||||
(insert entry)
|
(insert entry)
|
||||||
|
@ -370,7 +369,7 @@ This variable is relevant only if `org-bibtex-export-tags-as-keywords` is t."
|
||||||
(progn (goto-char (match-end 1)) (insert ", "))
|
(progn (goto-char (match-end 1)) (insert ", "))
|
||||||
(bibtex-make-field "keywords" t t))
|
(bibtex-make-field "keywords" t t))
|
||||||
(insert (mapconcat #'identity tags ", ")))
|
(insert (mapconcat #'identity tags ", ")))
|
||||||
(buffer-string)))))))
|
(buffer-string))))))
|
||||||
|
|
||||||
(defun org-bibtex-ask (field)
|
(defun org-bibtex-ask (field)
|
||||||
(unless (assoc field org-bibtex-fields)
|
(unless (assoc field org-bibtex-fields)
|
||||||
|
|
|
@ -111,11 +111,6 @@ any other entries, and any resulting duplicates will be removed entirely."
|
||||||
t)))
|
t)))
|
||||||
|
|
||||||
|
|
||||||
;;; cl macros no longer available in the trunk
|
|
||||||
(defalias 'org-labels (if (org-version-check "24.1.50" "cl" :predicate)
|
|
||||||
'cl-labels
|
|
||||||
'labels))
|
|
||||||
|
|
||||||
;;;; Emacs/XEmacs compatibility
|
;;;; Emacs/XEmacs compatibility
|
||||||
|
|
||||||
;; Keys
|
;; Keys
|
||||||
|
|
Loading…
Reference in New Issue