From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alan Schmitt Subject: I erroneously pushed a documentation patch to "maint" Date: Wed, 05 Feb 2014 13:54:18 +0100 Message-ID: Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:56824) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WB1zl-0001Pe-6n for emacs-orgmode@gnu.org; Wed, 05 Feb 2014 07:54:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WB1zf-0000ox-Uk for emacs-orgmode@gnu.org; Wed, 05 Feb 2014 07:54:25 -0500 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:5025) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WB1zf-0000or-NY for emacs-orgmode@gnu.org; Wed, 05 Feb 2014 07:54:19 -0500 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode Hello, I just did what I hope is a small mistake: I pushed the documentation patch below (for ox-koma-letter.el) to maint instead of to master. My first thought was that I could do another commit to remove this, but then it would pollute the history of this branch. Hence my questions: - should this commit be removed? - if so, what the best way to proceed? I'm very sorry for this blunder, Alan --8<---------------cut here---------------start------------->8--- 240cd3cb40fcc5f958eed7772e9520ef87bf9bd4 HEAD origin/maint maint Author: Rasmus Date: Sat Jan 25 14:08:15 2014 +0100 Documentation fixes for ox-koma-script.el * ox-koma-letter.el commentary (org-koma-letter-use-backaddress): Better documentation. Signed-off-by: Alan Schmitt 1 file changed, 18 insertions(+), 14 deletions(-) contrib/lisp/ox-koma-letter.el | 32 ++++++++++++++++++-------------- Modified contrib/lisp/ox-koma-letter.el diff --git a/contrib/lisp/ox-koma-letter.el b/contrib/lisp/ox-koma-letter.el index 2b7e847..a42a3a5 100644 --- a/contrib/lisp/ox-koma-letter.el +++ b/contrib/lisp/ox-koma-letter.el @@ -34,14 +34,14 @@ ;; On top of buffer keywords supported by `latex' back-end (see ;; `org-latex-options-alist'), this back-end introduces the following ;; keywords: -;; - "CLOSING" (see `org-koma-letter-closing'), -;; - "FROM_ADDRESS" (see `org-koma-letter-from-address'), -;; - "LCO" (see `org-koma-letter-class-option-file'), -;; - "OPENING" (see `org-koma-letter-opening'), -;; - "PHONE_NUMBER" (see `org-koma-letter-phone-number'), -;; - "SIGNATURE" (see `org-koma-letter-signature') -;; - "PLACE" (see `org-koma-letter-place') -;; - and "TO_ADDRESS". If unspecified this is set to "\mbox{}". +;; - CLOSING: see `org-koma-letter-closing', +;; - FROM_ADDRESS: see `org-koma-letter-from-address', +;; - LCO: see `org-koma-letter-class-option-file', +;; - OPENING: see `org-koma-letter-opening', +;; - PHONE_NUMBER: see `org-koma-letter-phone-number', +;; - SIGNATURE: see `org-koma-letter-signature', +;; - PLACE: see `org-koma-letter-place', +;; - TO_ADDRESS: If unspecified this is set to "\mbox{}". ;; ;; TO_ADDRESS and FROM_ADDRESS can also be specified using heading ;; with the special tags specified in @@ -67,8 +67,9 @@ ;; (see `org-koma-letter-special-tags-after-letter'). ;; ;; The following variables works differently from the main LaTeX class -;; - "AUTHOR": default to user-full-name but may be disabled. (see org-koma-letter-author), -;; - "EMAIL": same as AUTHOR, (see org-koma-letter-email), +;; - AUTHOR: Default to user-full-name but may be disabled. +;; (See also `org-koma-letter-author'), +;; - EMAIL: Same as AUTHOR. (see also `org-koma-letter-email'), ;; ;; Headlines are in general ignored. However, headlines with special ;; tags can be used for specified contents like postscript (ps), @@ -111,11 +112,16 @@ ;; \[EXTRA]")) ;; ;; Then, in your Org document, be sure to require the proper class -;; with : +;; with: ;; ;; #+LATEX_CLASS: my-letter ;; ;; Or by setting `org-koma-letter-default-class'. +;; +;; You may have to load (LaTeX) Babel as well, e.g., by adding +;; it to `org-latex-packages-alist', +;; +;; (add-to-list 'org-latex-packages-alist '("AUTO" "babel" nil)) ;;; Code: @@ -230,10 +236,8 @@ English manual of 2012-07-22)." (string)) :group 'org-export-koma-letter) - - (defcustom org-koma-letter-use-backaddress nil - "Print return address in small line above to address." + "Print return address in line above to address." :group 'org-export-koma-letter :type 'boolean) --8<---------------cut here---------------end--------------->8---