ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2013-11-25 23:36:38 +01:00
parent be8a1a2d69 3ead82a321
commit a9eec72ecf
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lisp/org-element.el
View File

@ -144,10 +144,12 @@
"$" "\\|" "$" "\\|"
;; Tables (any type). ;; Tables (any type).
"\\(?:|\\|\\+-[-+]\\)" "\\|" "\\(?:|\\|\\+-[-+]\\)" "\\|"
;; Blocks (any type), Babel calls, drawers (any type), ;; Blocks (any type), Babel calls and keywords. Note: this
;; fixed-width areas and keywords. Note: this is only an ;; is only an indication and need some thorough check.
;; indication and need some thorough check. "#\\(?:[+ ]\\|$\\)" "\\|"
"[#:]" "\\|" ;; Drawers (any type) and fixed-width areas. This is also
;; only an indication.
":" "\\|"
;; Horizontal rules. ;; Horizontal rules.
"-\\{5,\\}[ \t]*$" "\\|" "-\\{5,\\}[ \t]*$" "\\|"
;; LaTeX environments. ;; LaTeX environments.

5
lisp/ox-publish.el
View File

@ -1226,8 +1226,9 @@ Returns value on success, else nil."
(let ((attr (file-attributes (let ((attr (file-attributes
(expand-file-name (or (file-symlink-p file) file) (expand-file-name (or (file-symlink-p file) file)
(file-name-directory file))))) (file-name-directory file)))))
(+ (lsh (car (nth 5 attr)) 16) (if (not attr) (error "No such file: \"%s\"" file)
(cadr (nth 5 attr))))) (+ (lsh (car (nth 5 attr)) 16)
(cadr (nth 5 attr))))))
(provide 'ox-publish) (provide 'ox-publish)