From f6413e23baa829b0c064d9a2cbc69e934e0de909 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Sat, 8 Nov 2008 22:28:11 +0100 Subject: [PATCH] More changes from downstream Emacs. --- lisp/org-agenda.el | 12 ++++++------ lisp/org-publish.el | 6 +----- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 7968b502a..6c119044a 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -5061,12 +5061,12 @@ the new TODO state." (if line (point-at-eol) nil) t) (add-text-properties (match-beginning 2) (match-end 2) - (list 'face (delq nil (adjoin 'org-tag - (let ((prop (get-text-property - (match-beginning 2) 'face))) - (if (listp prop) - prop - (list prop))))))) + (list 'face (delq nil (let ((prop (get-text-property + (match-beginning 2) 'face))) + (or (listp prop) (setq prop (list prop))) + (if (memq 'org-tag prop) + prop + (cons 'org-tag prop)))))) (setq l (- (match-end 2) (match-beginning 2)) c (if (< org-agenda-tags-column 0) (- (abs org-agenda-tags-column) l) diff --git a/lisp/org-publish.el b/lisp/org-publish.el index 27ab1ab8c..5967d3446 100644 --- a/lisp/org-publish.el +++ b/lisp/org-publish.el @@ -535,13 +535,9 @@ See `org-publish-org-to' to the list of arguments." "Publish a file with no transformation of any kind. See `org-publish-org-to' to the list of arguments." ;; make sure eshell/cp code is loaded - (eval-and-compile - (require 'eshell) -; (require 'esh-maint) - (require 'em-unix)) (unless (file-directory-p pub-dir) (make-directory pub-dir t)) - (eshell/cp filename pub-dir)) + (copy-file filename pub-dir)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Publishing files, sets of files, and indices -- 2.11.4.GIT