mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2016-12-27 08:33:26 +01:00
parent 517fed8d4d bbbed7aad9
commit 5b8ebe6576
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ox-publish.el
View File

@ -371,7 +371,7 @@ still decide about that independently."
filename pub-dir pub-func base-dir))))
(if rtn (message "Publishing file %s using `%s'" filename pub-func)
(when org-publish-list-skipped-files
(message "Skipping unmodified file %s" filename)))
(message "Skipping unmodified file %s" filename)))
rtn))
(defun org-publish-update-timestamp
@ -621,7 +621,7 @@ If `:auto-sitemap' is set, publish the sitemap too. If
(or (org-publish-property :sitemap-filename project)
"sitemap.org")))
(org-publish-sitemap project sitemap-filename)))
;; Publish all files from PROJECT excepted "theindex.org". Its
;; Publish all files from PROJECT except "theindex.org". Its
;; publishing will be deferred until "theindex.inc" is
;; populated.
(let ((theindex (expand-file-name
@ -1047,7 +1047,7 @@ publishing directory."
(dotimes (n len)
(insert
(concat
(make-string (* (+ rank n) 2) ? ) " - "
(make-string (* (+ rank n) 2) ?\s) " - "
(if (not (= (1- len) n)) (nth (+ rank n) entry)
;; Last term: Link it to TARGET, if possible.
(let ((target (nth 2 idx)))