[Emacs-diffs] Changes to emacs/lisp/textmodes/org-publish.el,v

[John Wiegley]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     John Wiegley <johnw>    07/10/22 21:56:25

Index: textmodes/org-publish.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/textmodes/org-publish.el,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- textmodes/org-publish.el    21 Oct 2007 00:24:30 -0000      1.16
+++ textmodes/org-publish.el    22 Oct 2007 21:56:24 -0000      1.17
@@ -4,7 +4,7 @@
 
 ;; Author: David O'Toole <address@hidden>
 ;; Keywords: hypermedia, outlines
-;; Version: 1.80
+;; Version: 1.80a
 
 ;; This file is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -426,7 +426,7 @@
 (defun org-publish-get-plist-from-filename (filename)
   "Return publishing configuration plist for file FILENAME."
   (let ((found nil))
-    (mapc
+    (mapcar
      (lambda (plist)
        (let ((files (org-publish-get-base-files plist)))
         (if (member (expand-file-name filename) files)
@@ -438,20 +438,6 @@
 
 ;;;; Pluggable publishing back-end functions
 
-
-(defun org-publish-org-to-html (plist filename)
-  "Publish an org file to HTML.
-PLIST is the property list for the given project.
-FILENAME is the filename of the org file to be published."
-  (eval-and-compile (require 'org))
-  (let* ((arg (plist-get plist :headline-levels)))
-    (progn
-      (find-file filename)
-      (org-export-as-html arg nil plist)
-      ;; get rid of HTML buffer
-      (kill-buffer (current-buffer)))))
-
-
 (defun org-publish-org-to-latex (plist filename)
   "Publish an org file to LaTeX."
   (org-publish-org-to "latex" plist filename))
@@ -464,7 +450,7 @@
   "Publish an org file to FORMAT.
 PLIST is the property list for the given project.
 FILENAME is the filename of the org file to be published."
-  (eval-and-compile (require 'org))
+  (require 'org)
   (let* ((arg (plist-get plist :headline-levels)))
     (progn
       (find-file filename)
@@ -478,10 +464,9 @@
 PLIST is the property list for the given project.
 FILENAME is the filename of the file to be published."
   ;; make sure eshell/cp code is loaded
-  (eval-and-compile
     (require 'eshell)
     (require 'esh-maint)
-    (require 'em-unix))
+  (require 'em-unix)
   (let ((destination (file-name-as-directory (plist-get plist 
:publishing-directory))))
     (eshell/cp filename destination)))