2013-11-12 13:06:26 +00:00
|
|
|
;;; ox-org.el --- Org Back-End for Org Export Engine
|
|
|
|
|
2014-01-01 07:43:34 +00:00
|
|
|
;; Copyright (C) 2013-2014 Free Software Foundation, Inc.
|
2013-11-12 13:06:26 +00:00
|
|
|
|
|
|
|
;; Author: Nicolas Goaziou <n.goaziou@gmail.com>
|
|
|
|
;; Keywords: org, wp
|
|
|
|
|
Fix and standardize some copyright and license notices
* ob-abc.el: Add year, part of Emacs, standardize license text.
* ob-ebnf.el: Part of Emacs, standardize license text.
* ob-makefile.el: Fix years.
* org-macro.el, ox-beamer.el, ox-latex.el, ox-org.el: Part of Emacs.
* ox-ascii.el, ox-md.el, ox.el: Use range for years, part of Emacs.
* ox-html.el: Part of Emacs.
(org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Set copyright holder to FSF.
* ox-icalendar.el: Part of Emacs, fix years.
* ox-texinfo.el: Copyright to FSF, use range for years.
2013-11-12 17:03:46 +00:00
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
2013-11-12 13:06:26 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
;;; Code:
|
2014-01-07 13:22:53 +00:00
|
|
|
|
2013-11-12 13:06:26 +00:00
|
|
|
(require 'ox)
|
|
|
|
(declare-function htmlize-buffer "htmlize" (&optional buffer))
|
|
|
|
|
|
|
|
(defgroup org-export-org nil
|
|
|
|
"Options for exporting Org mode files to Org."
|
|
|
|
:tag "Org Export Org"
|
|
|
|
:group 'org-export
|
|
|
|
:version "24.4"
|
|
|
|
:package-version '(Org . "8.0"))
|
|
|
|
|
|
|
|
(define-obsolete-variable-alias
|
|
|
|
'org-export-htmlized-org-css-url 'org-org-htmlized-css-url "24.4")
|
|
|
|
(defcustom org-org-htmlized-css-url nil
|
|
|
|
"URL pointing to the CSS defining colors for htmlized Emacs buffers.
|
|
|
|
Normally when creating an htmlized version of an Org buffer,
|
|
|
|
htmlize will create the CSS to define the font colors. However,
|
|
|
|
this does not work when converting in batch mode, and it also can
|
|
|
|
look bad if different people with different fontification setup
|
|
|
|
work on the same website. When this variable is non-nil,
|
|
|
|
creating an htmlized version of an Org buffer using
|
|
|
|
`org-org-export-as-org' will include a link to this URL if the
|
|
|
|
setting of `org-html-htmlize-output-type' is 'css."
|
|
|
|
:group 'org-export-org
|
|
|
|
:type '(choice
|
|
|
|
(const :tag "Don't include external stylesheet link" nil)
|
|
|
|
(string :tag "URL or local href")))
|
|
|
|
|
|
|
|
(org-export-define-backend 'org
|
|
|
|
'((babel-call . org-org-identity)
|
|
|
|
(bold . org-org-identity)
|
|
|
|
(center-block . org-org-identity)
|
|
|
|
(clock . org-org-identity)
|
|
|
|
(code . org-org-identity)
|
|
|
|
(comment . (lambda (&rest args) ""))
|
|
|
|
(comment-block . (lambda (&rest args) ""))
|
|
|
|
(diary-sexp . org-org-identity)
|
|
|
|
(drawer . org-org-identity)
|
|
|
|
(dynamic-block . org-org-identity)
|
|
|
|
(entity . org-org-identity)
|
|
|
|
(example-block . org-org-identity)
|
|
|
|
(fixed-width . org-org-identity)
|
2014-10-03 08:13:51 +00:00
|
|
|
(footnote-definition . ignore)
|
2013-11-12 13:06:26 +00:00
|
|
|
(footnote-reference . org-org-identity)
|
|
|
|
(headline . org-org-headline)
|
|
|
|
(horizontal-rule . org-org-identity)
|
|
|
|
(inline-babel-call . org-org-identity)
|
|
|
|
(inline-src-block . org-org-identity)
|
|
|
|
(inlinetask . org-org-identity)
|
|
|
|
(italic . org-org-identity)
|
|
|
|
(item . org-org-identity)
|
|
|
|
(keyword . org-org-keyword)
|
|
|
|
(latex-environment . org-org-identity)
|
|
|
|
(latex-fragment . org-org-identity)
|
|
|
|
(line-break . org-org-identity)
|
|
|
|
(link . org-org-identity)
|
|
|
|
(node-property . org-org-identity)
|
|
|
|
(paragraph . org-org-identity)
|
|
|
|
(plain-list . org-org-identity)
|
|
|
|
(planning . org-org-identity)
|
|
|
|
(property-drawer . org-org-identity)
|
|
|
|
(quote-block . org-org-identity)
|
|
|
|
(quote-section . org-org-identity)
|
|
|
|
(radio-target . org-org-identity)
|
2014-10-03 08:13:51 +00:00
|
|
|
(section . org-org-section)
|
2013-11-12 13:06:26 +00:00
|
|
|
(special-block . org-org-identity)
|
|
|
|
(src-block . org-org-identity)
|
|
|
|
(statistics-cookie . org-org-identity)
|
|
|
|
(strike-through . org-org-identity)
|
|
|
|
(subscript . org-org-identity)
|
|
|
|
(superscript . org-org-identity)
|
|
|
|
(table . org-org-identity)
|
|
|
|
(table-cell . org-org-identity)
|
|
|
|
(table-row . org-org-identity)
|
|
|
|
(target . org-org-identity)
|
|
|
|
(timestamp . org-org-identity)
|
|
|
|
(underline . org-org-identity)
|
|
|
|
(verbatim . org-org-identity)
|
|
|
|
(verse-block . org-org-identity))
|
|
|
|
:menu-entry
|
|
|
|
'(?O "Export to Org"
|
|
|
|
((?O "As Org buffer" org-org-export-as-org)
|
|
|
|
(?o "As Org file" org-org-export-to-org)
|
|
|
|
(?v "As Org file and open"
|
|
|
|
(lambda (a s v b)
|
|
|
|
(if a (org-org-export-to-org t s v b)
|
|
|
|
(org-open-file (org-org-export-to-org nil s v b))))))))
|
|
|
|
|
|
|
|
(defun org-org-identity (blob contents info)
|
|
|
|
"Transcode BLOB element or object back into Org syntax.
|
|
|
|
CONTENTS is its contents, as a string or nil. INFO is ignored."
|
2014-01-07 13:22:53 +00:00
|
|
|
(let ((case-fold-search t))
|
|
|
|
(replace-regexp-in-string
|
|
|
|
"^[ \t]*#\\+ATTR_[-_A-Za-z0-9]+:\\(?: .*\\)?\n" ""
|
|
|
|
(org-export-expand blob contents t))))
|
2013-11-12 13:06:26 +00:00
|
|
|
|
|
|
|
(defun org-org-headline (headline contents info)
|
|
|
|
"Transcode HEADLINE element back into Org syntax.
|
|
|
|
CONTENTS is its contents, as a string or nil. INFO is ignored."
|
2014-10-03 08:13:51 +00:00
|
|
|
(unless (org-element-property :footnote-section-p headline)
|
|
|
|
(unless (plist-get info :with-todo-keywords)
|
|
|
|
(org-element-put-property headline :todo-keyword nil))
|
|
|
|
(unless (plist-get info :with-tags)
|
|
|
|
(org-element-put-property headline :tags nil))
|
|
|
|
(unless (plist-get info :with-priority)
|
|
|
|
(org-element-put-property headline :priority nil))
|
|
|
|
(org-element-put-property headline :level
|
|
|
|
(org-export-get-relative-level headline info))
|
|
|
|
(org-element-headline-interpreter headline contents)))
|
2013-11-12 13:06:26 +00:00
|
|
|
|
|
|
|
(defun org-org-keyword (keyword contents info)
|
|
|
|
"Transcode KEYWORD element back into Org syntax.
|
|
|
|
CONTENTS is nil. INFO is ignored. This function ignores
|
|
|
|
keywords targeted at other export back-ends."
|
|
|
|
(unless (member (org-element-property :key keyword)
|
|
|
|
(mapcar
|
|
|
|
(lambda (block-cons)
|
|
|
|
(and (eq (cdr block-cons) 'org-element-export-block-parser)
|
|
|
|
(car block-cons)))
|
|
|
|
org-element-block-name-alist))
|
|
|
|
(org-element-keyword-interpreter keyword nil)))
|
|
|
|
|
2014-10-03 08:13:51 +00:00
|
|
|
(defun org-org-section (section contents info)
|
|
|
|
"Transcode SECTION element back into Org syntax.
|
|
|
|
CONTENTS is the contents of the section. INFO is a plist used as
|
|
|
|
a communication channel."
|
|
|
|
(concat
|
|
|
|
(org-element-normalize-string contents)
|
|
|
|
;; Insert footnote definitions appearing for the first time in this
|
|
|
|
;; section. Indeed, some of them may not be available to narrowing
|
|
|
|
;; so we make sure all of them are included in the result.
|
|
|
|
(let ((footnotes-alist
|
|
|
|
(org-element-map section 'footnote-reference
|
|
|
|
(lambda (fn)
|
|
|
|
(and (eq (org-element-property :type fn) 'standard)
|
|
|
|
(org-export-footnote-first-reference-p fn info)
|
|
|
|
(cons (org-element-property :label fn)
|
|
|
|
(org-export-get-footnote-definition fn info))))
|
|
|
|
info)))
|
|
|
|
(and footnotes-alist
|
|
|
|
(concat "\n"
|
|
|
|
(mapconcat
|
|
|
|
(lambda (d)
|
|
|
|
(org-element-normalize-string
|
|
|
|
(concat (format "[%s] "(car d))
|
|
|
|
(org-export-data (cdr d) info))))
|
|
|
|
footnotes-alist "\n"))))
|
|
|
|
(make-string (or (org-element-property :post-blank section) 0) ?\n)))
|
|
|
|
|
2013-11-12 13:06:26 +00:00
|
|
|
;;;###autoload
|
|
|
|
(defun org-org-export-as-org (&optional async subtreep visible-only ext-plist)
|
|
|
|
"Export current buffer to an Org buffer.
|
|
|
|
|
|
|
|
If narrowing is active in the current buffer, only export its
|
|
|
|
narrowed part.
|
|
|
|
|
|
|
|
If a region is active, export that region.
|
|
|
|
|
|
|
|
A non-nil optional argument ASYNC means the process should happen
|
|
|
|
asynchronously. The resulting buffer should be accessible
|
|
|
|
through the `org-export-stack' interface.
|
|
|
|
|
|
|
|
When optional argument SUBTREEP is non-nil, export the sub-tree
|
|
|
|
at point, extracting information from the headline properties
|
|
|
|
first.
|
|
|
|
|
|
|
|
When optional argument VISIBLE-ONLY is non-nil, don't export
|
|
|
|
contents of hidden elements.
|
|
|
|
|
|
|
|
EXT-PLIST, when provided, is a property list with external
|
|
|
|
parameters overriding Org default settings, but still inferior to
|
|
|
|
file-local settings.
|
|
|
|
|
|
|
|
Export is done in a buffer named \"*Org ORG Export*\", which will
|
|
|
|
be displayed when `org-export-show-temporary-export-buffer' is
|
|
|
|
non-nil."
|
|
|
|
(interactive)
|
|
|
|
(org-export-to-buffer 'org "*Org ORG Export*"
|
|
|
|
async subtreep visible-only nil ext-plist (lambda () (org-mode))))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun org-org-export-to-org (&optional async subtreep visible-only ext-plist)
|
|
|
|
"Export current buffer to an org file.
|
|
|
|
|
|
|
|
If narrowing is active in the current buffer, only export its
|
|
|
|
narrowed part.
|
|
|
|
|
|
|
|
If a region is active, export that region.
|
|
|
|
|
|
|
|
A non-nil optional argument ASYNC means the process should happen
|
|
|
|
asynchronously. The resulting file should be accessible through
|
|
|
|
the `org-export-stack' interface.
|
|
|
|
|
|
|
|
When optional argument SUBTREEP is non-nil, export the sub-tree
|
|
|
|
at point, extracting information from the headline properties
|
|
|
|
first.
|
|
|
|
|
|
|
|
When optional argument VISIBLE-ONLY is non-nil, don't export
|
|
|
|
contents of hidden elements.
|
|
|
|
|
|
|
|
EXT-PLIST, when provided, is a property list with external
|
|
|
|
parameters overriding Org default settings, but still inferior to
|
|
|
|
file-local settings.
|
|
|
|
|
|
|
|
Return output file name."
|
|
|
|
(interactive)
|
|
|
|
(let ((outfile (org-export-output-file-name ".org" subtreep)))
|
|
|
|
(org-export-to-file 'org outfile
|
|
|
|
async subtreep visible-only nil ext-plist)))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun org-org-publish-to-org (plist filename pub-dir)
|
|
|
|
"Publish an org file to org.
|
|
|
|
|
|
|
|
FILENAME is the filename of the Org file to be published. PLIST
|
|
|
|
is the property list for the given project. PUB-DIR is the
|
|
|
|
publishing directory.
|
|
|
|
|
|
|
|
Return output file name."
|
|
|
|
(org-publish-org-to 'org filename ".org" plist pub-dir)
|
|
|
|
(when (plist-get plist :htmlized-source)
|
|
|
|
(require 'htmlize)
|
|
|
|
(require 'ox-html)
|
|
|
|
(let* ((org-inhibit-startup t)
|
|
|
|
(htmlize-output-type 'css)
|
|
|
|
(html-ext (concat "." (or (plist-get plist :html-extension)
|
|
|
|
org-html-extension "html")))
|
|
|
|
(visitingp (find-buffer-visiting filename))
|
* lisp/font-lock.el (font-lock-flush, font-lock-ensure): New functions.
(font-lock-fontify-buffer): Mark interactive-only.
(font-lock-multiline, font-lock-fontified, font-lock-set-defaults):
Make buffer-local.
(font-lock-specified-p): Remove redundant boundp check.
(font-lock-flush-function, font-lock-ensure-function): New vars.
(font-lock-turn-on-thing-lock): Set them.
(font-lock-default-fontify-buffer): Obey font-lock-dont-widen.
(font-lock-after-change-function): Make `old-len' optional.
(font-lock-set-defaults): Remove redundant `set' of font-lock-defaults.
Call font-lock-flush, just in case.
* lisp/progmodes/verilog-mode.el (verilog-preprocess): Disable workaround in
recent Emacsen.
* lisp/progmodes/vera-mode.el (vera-fontify-buffer): Declare obsolete.
(vera-mode-map, vera-mode-menu): Remove bindings to it.
* lisp/progmodes/idlw-help.el (idlwave-help-fontify): Use font-lock-ensure
and with-syntax-table.
* lisp/textmodes/conf-mode.el (conf-quote-normal):
* lisp/progmodes/sh-script.el (sh-set-shell):
* lisp/progmodes/prog-mode.el (prettify-symbols-mode):
* lisp/progmodes/f90.el (f90-font-lock-n):
* lisp/progmodes/cwarn.el (cwarn-mode):
* lisp/nxml/nxml-mode.el (nxml-toggle-char-ref-extra-display):
* lisp/progmodes/compile.el (compilation-setup, compilation--unsetup):
* lisp/hi-lock.el (hi-lock-mode, hi-lock-unface-buffer)
(hi-lock-set-pattern, hi-lock-set-file-patterns): Use font-lock-flush.
* lisp/mail/rmail.el (rmail-variables): Set font-lock-dont-widen instead of
font-lock-fontify-buffer-function and
font-lock-unfontify-buffer-function.
(rmail-unfontify-buffer-function, rmail-fontify-message):
Use with-silent-modifications.
* lisp/htmlfontify.el (hfy-force-fontification): Use jit-lock-fontify-now
and font-lock-ensure.
* lisp/bs.el (bs-show-in-buffer): Use font-lock-ensure.
* lisp/gnus/mm-view.el (mm-display-inline-fontify): Use font-lock-ensure.
* lisp/gnus/gnus-cite.el (gnus-message-citation-mode): Use font-lock-flush.
* lisp/org/org-compat.el (org-font-lock-ensure): New function.
* lisp/org/ox-odt.el (org-odt-do-format-code):
* lisp/org/ox-html.el (org-html-fontify-code):
* lisp/org/org.el (org-fontify-like-in-org-mode):
* lisp/org/org-src.el (org-src-font-lock-fontify-block):
* lisp/org/org-clock.el (org-clock-get-clocktable): Use it.
* lisp/org/ox-org.el (org-org-publish-to-org): Use it. Avoid using find-file
from Elisp.
* test/automated/ruby-mode-tests.el (ruby-assert-face): Use font-lock-ensure.
(ruby-interpolation-keeps-non-quote-syntax): Use syntax-propertize.
2014-05-29 03:45:29 +00:00
|
|
|
(work-buffer (or visitingp (find-file-noselect filename)))
|
2013-11-12 13:06:26 +00:00
|
|
|
newbuf)
|
* lisp/font-lock.el (font-lock-flush, font-lock-ensure): New functions.
(font-lock-fontify-buffer): Mark interactive-only.
(font-lock-multiline, font-lock-fontified, font-lock-set-defaults):
Make buffer-local.
(font-lock-specified-p): Remove redundant boundp check.
(font-lock-flush-function, font-lock-ensure-function): New vars.
(font-lock-turn-on-thing-lock): Set them.
(font-lock-default-fontify-buffer): Obey font-lock-dont-widen.
(font-lock-after-change-function): Make `old-len' optional.
(font-lock-set-defaults): Remove redundant `set' of font-lock-defaults.
Call font-lock-flush, just in case.
* lisp/progmodes/verilog-mode.el (verilog-preprocess): Disable workaround in
recent Emacsen.
* lisp/progmodes/vera-mode.el (vera-fontify-buffer): Declare obsolete.
(vera-mode-map, vera-mode-menu): Remove bindings to it.
* lisp/progmodes/idlw-help.el (idlwave-help-fontify): Use font-lock-ensure
and with-syntax-table.
* lisp/textmodes/conf-mode.el (conf-quote-normal):
* lisp/progmodes/sh-script.el (sh-set-shell):
* lisp/progmodes/prog-mode.el (prettify-symbols-mode):
* lisp/progmodes/f90.el (f90-font-lock-n):
* lisp/progmodes/cwarn.el (cwarn-mode):
* lisp/nxml/nxml-mode.el (nxml-toggle-char-ref-extra-display):
* lisp/progmodes/compile.el (compilation-setup, compilation--unsetup):
* lisp/hi-lock.el (hi-lock-mode, hi-lock-unface-buffer)
(hi-lock-set-pattern, hi-lock-set-file-patterns): Use font-lock-flush.
* lisp/mail/rmail.el (rmail-variables): Set font-lock-dont-widen instead of
font-lock-fontify-buffer-function and
font-lock-unfontify-buffer-function.
(rmail-unfontify-buffer-function, rmail-fontify-message):
Use with-silent-modifications.
* lisp/htmlfontify.el (hfy-force-fontification): Use jit-lock-fontify-now
and font-lock-ensure.
* lisp/bs.el (bs-show-in-buffer): Use font-lock-ensure.
* lisp/gnus/mm-view.el (mm-display-inline-fontify): Use font-lock-ensure.
* lisp/gnus/gnus-cite.el (gnus-message-citation-mode): Use font-lock-flush.
* lisp/org/org-compat.el (org-font-lock-ensure): New function.
* lisp/org/ox-odt.el (org-odt-do-format-code):
* lisp/org/ox-html.el (org-html-fontify-code):
* lisp/org/org.el (org-fontify-like-in-org-mode):
* lisp/org/org-src.el (org-src-font-lock-fontify-block):
* lisp/org/org-clock.el (org-clock-get-clocktable): Use it.
* lisp/org/ox-org.el (org-org-publish-to-org): Use it. Avoid using find-file
from Elisp.
* test/automated/ruby-mode-tests.el (ruby-assert-face): Use font-lock-ensure.
(ruby-interpolation-keeps-non-quote-syntax): Use syntax-propertize.
2014-05-29 03:45:29 +00:00
|
|
|
(with-current-buffer work-buffer
|
|
|
|
(org-font-lock-ensure)
|
|
|
|
(show-all)
|
|
|
|
(org-show-block-all)
|
|
|
|
(setq newbuf (htmlize-buffer)))
|
2013-11-12 13:06:26 +00:00
|
|
|
(with-current-buffer newbuf
|
|
|
|
(when org-org-htmlized-css-url
|
|
|
|
(goto-char (point-min))
|
|
|
|
(and (re-search-forward
|
|
|
|
"<style type=\"text/css\">[^\000]*?\n[ \t]*</style>.*" nil t)
|
|
|
|
(replace-match
|
|
|
|
(format
|
|
|
|
"<link rel=\"stylesheet\" type=\"text/css\" href=\"%s\">"
|
* lisp/font-lock.el (font-lock-flush, font-lock-ensure): New functions.
(font-lock-fontify-buffer): Mark interactive-only.
(font-lock-multiline, font-lock-fontified, font-lock-set-defaults):
Make buffer-local.
(font-lock-specified-p): Remove redundant boundp check.
(font-lock-flush-function, font-lock-ensure-function): New vars.
(font-lock-turn-on-thing-lock): Set them.
(font-lock-default-fontify-buffer): Obey font-lock-dont-widen.
(font-lock-after-change-function): Make `old-len' optional.
(font-lock-set-defaults): Remove redundant `set' of font-lock-defaults.
Call font-lock-flush, just in case.
* lisp/progmodes/verilog-mode.el (verilog-preprocess): Disable workaround in
recent Emacsen.
* lisp/progmodes/vera-mode.el (vera-fontify-buffer): Declare obsolete.
(vera-mode-map, vera-mode-menu): Remove bindings to it.
* lisp/progmodes/idlw-help.el (idlwave-help-fontify): Use font-lock-ensure
and with-syntax-table.
* lisp/textmodes/conf-mode.el (conf-quote-normal):
* lisp/progmodes/sh-script.el (sh-set-shell):
* lisp/progmodes/prog-mode.el (prettify-symbols-mode):
* lisp/progmodes/f90.el (f90-font-lock-n):
* lisp/progmodes/cwarn.el (cwarn-mode):
* lisp/nxml/nxml-mode.el (nxml-toggle-char-ref-extra-display):
* lisp/progmodes/compile.el (compilation-setup, compilation--unsetup):
* lisp/hi-lock.el (hi-lock-mode, hi-lock-unface-buffer)
(hi-lock-set-pattern, hi-lock-set-file-patterns): Use font-lock-flush.
* lisp/mail/rmail.el (rmail-variables): Set font-lock-dont-widen instead of
font-lock-fontify-buffer-function and
font-lock-unfontify-buffer-function.
(rmail-unfontify-buffer-function, rmail-fontify-message):
Use with-silent-modifications.
* lisp/htmlfontify.el (hfy-force-fontification): Use jit-lock-fontify-now
and font-lock-ensure.
* lisp/bs.el (bs-show-in-buffer): Use font-lock-ensure.
* lisp/gnus/mm-view.el (mm-display-inline-fontify): Use font-lock-ensure.
* lisp/gnus/gnus-cite.el (gnus-message-citation-mode): Use font-lock-flush.
* lisp/org/org-compat.el (org-font-lock-ensure): New function.
* lisp/org/ox-odt.el (org-odt-do-format-code):
* lisp/org/ox-html.el (org-html-fontify-code):
* lisp/org/org.el (org-fontify-like-in-org-mode):
* lisp/org/org-src.el (org-src-font-lock-fontify-block):
* lisp/org/org-clock.el (org-clock-get-clocktable): Use it.
* lisp/org/ox-org.el (org-org-publish-to-org): Use it. Avoid using find-file
from Elisp.
* test/automated/ruby-mode-tests.el (ruby-assert-face): Use font-lock-ensure.
(ruby-interpolation-keeps-non-quote-syntax): Use syntax-propertize.
2014-05-29 03:45:29 +00:00
|
|
|
org-org-htmlized-css-url)
|
|
|
|
t t)))
|
2013-11-12 13:06:26 +00:00
|
|
|
(write-file (concat pub-dir (file-name-nondirectory filename) html-ext)))
|
|
|
|
(kill-buffer newbuf)
|
|
|
|
(unless visitingp (kill-buffer work-buffer)))
|
* lisp/font-lock.el (font-lock-flush, font-lock-ensure): New functions.
(font-lock-fontify-buffer): Mark interactive-only.
(font-lock-multiline, font-lock-fontified, font-lock-set-defaults):
Make buffer-local.
(font-lock-specified-p): Remove redundant boundp check.
(font-lock-flush-function, font-lock-ensure-function): New vars.
(font-lock-turn-on-thing-lock): Set them.
(font-lock-default-fontify-buffer): Obey font-lock-dont-widen.
(font-lock-after-change-function): Make `old-len' optional.
(font-lock-set-defaults): Remove redundant `set' of font-lock-defaults.
Call font-lock-flush, just in case.
* lisp/progmodes/verilog-mode.el (verilog-preprocess): Disable workaround in
recent Emacsen.
* lisp/progmodes/vera-mode.el (vera-fontify-buffer): Declare obsolete.
(vera-mode-map, vera-mode-menu): Remove bindings to it.
* lisp/progmodes/idlw-help.el (idlwave-help-fontify): Use font-lock-ensure
and with-syntax-table.
* lisp/textmodes/conf-mode.el (conf-quote-normal):
* lisp/progmodes/sh-script.el (sh-set-shell):
* lisp/progmodes/prog-mode.el (prettify-symbols-mode):
* lisp/progmodes/f90.el (f90-font-lock-n):
* lisp/progmodes/cwarn.el (cwarn-mode):
* lisp/nxml/nxml-mode.el (nxml-toggle-char-ref-extra-display):
* lisp/progmodes/compile.el (compilation-setup, compilation--unsetup):
* lisp/hi-lock.el (hi-lock-mode, hi-lock-unface-buffer)
(hi-lock-set-pattern, hi-lock-set-file-patterns): Use font-lock-flush.
* lisp/mail/rmail.el (rmail-variables): Set font-lock-dont-widen instead of
font-lock-fontify-buffer-function and
font-lock-unfontify-buffer-function.
(rmail-unfontify-buffer-function, rmail-fontify-message):
Use with-silent-modifications.
* lisp/htmlfontify.el (hfy-force-fontification): Use jit-lock-fontify-now
and font-lock-ensure.
* lisp/bs.el (bs-show-in-buffer): Use font-lock-ensure.
* lisp/gnus/mm-view.el (mm-display-inline-fontify): Use font-lock-ensure.
* lisp/gnus/gnus-cite.el (gnus-message-citation-mode): Use font-lock-flush.
* lisp/org/org-compat.el (org-font-lock-ensure): New function.
* lisp/org/ox-odt.el (org-odt-do-format-code):
* lisp/org/ox-html.el (org-html-fontify-code):
* lisp/org/org.el (org-fontify-like-in-org-mode):
* lisp/org/org-src.el (org-src-font-lock-fontify-block):
* lisp/org/org-clock.el (org-clock-get-clocktable): Use it.
* lisp/org/ox-org.el (org-org-publish-to-org): Use it. Avoid using find-file
from Elisp.
* test/automated/ruby-mode-tests.el (ruby-assert-face): Use font-lock-ensure.
(ruby-interpolation-keeps-non-quote-syntax): Use syntax-propertize.
2014-05-29 03:45:29 +00:00
|
|
|
;; FIXME: Why? Which buffer is this supposed to apply to?
|
2013-11-12 13:06:26 +00:00
|
|
|
(set-buffer-modified-p nil)))
|
|
|
|
|
|
|
|
|
|
|
|
(provide 'ox-org)
|
|
|
|
|
|
|
|
;; Local variables:
|
|
|
|
;; generated-autoload-file: "org-loaddefs.el"
|
|
|
|
;; End:
|
|
|
|
|
|
|
|
;;; ox-org.el ends here
|