mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-07-15 22:46:26 +00:00
Code Releases Activity

Merge branch 'maint'

Browse source 
Conflicts:
	contrib/lisp/ox-koma-letter.el
This commit is contained in:
Bastien Guerry 2014-02-05 16:16:36 +01:00
parent 980c021609 a6f81047a4
commit 13b5123da1
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
contrib/lisp/ox-koma-letter.el
View file

@ -70,8 +70,6 @@
;; - AUTHOR: Default to user-full-name but may be disabled. ;; - AUTHOR: Default to user-full-name but may be disabled.
;; (See also `org-koma-letter-author'), ;; (See also `org-koma-letter-author'),
;; - EMAIL: Same as AUTHOR. (see also `org-koma-letter-email'), ;; - EMAIL: Same as AUTHOR. (see also `org-koma-letter-email'),
;; - TITLE: May be the letter title or subject depending on
;; `org-koma-letter-prefer-subject'.
;; ;;
;; Headlines are in general ignored. However, headlines with special ;; Headlines are in general ignored. However, headlines with special
;; tags can be used for specified contents like postscript (ps), ;; tags can be used for specified contents like postscript (ps),
@ -260,9 +258,13 @@ This option can also be set with the OPTIONS keyword, e.g.:
:group 'org-export-koma-letter) :group 'org-export-koma-letter)
(defcustom org-koma-letter-use-backaddress nil (defcustom org-koma-letter-use-backaddress nil
<<<<<<< HEAD
"Non-nil prints return address in line above to address. "Non-nil prints return address in line above to address.
This option can also be set with the OPTIONS keyword, e.g.: This option can also be set with the OPTIONS keyword, e.g.:
\"backaddress:t\"." \"backaddress:t\"."
=======
"Print return address in line above to address."
>>>>>>> maint
:group 'org-export-koma-letter :group 'org-export-koma-letter
:type 'boolean) :type 'boolean)

8
lisp/org.el
View file

@ -5230,11 +5230,11 @@ Support for group tags is controlled by the option
(defun org-file-contents (file &optional noerror) (defun org-file-contents (file &optional noerror)
"Return the contents of FILE, as a string." "Return the contents of FILE, as a string."
(if (or (not file) (if (or (not file) (not (file-readable-p file)))
(not (file-readable-p file))) (if (not noerror)
(if noerror (error "Cannot read file \"%s\"" file)
(message "Cannot read file \"%s\"" file) (message "Cannot read file \"%s\"" file)
(error "Cannot read file \"%s\"" file)) "")
(with-temp-buffer (with-temp-buffer
(insert-file-contents file) (insert-file-contents file)
(buffer-string)))) (buffer-string))))