* I erroneously pushed a documentation patch to "maint"
@ 2014-02-05 12:54 Alan Schmitt
2014-02-05 13:07 ` Bastien
0 siblings, 1 reply; 2+ messages in thread
From: Alan Schmitt @ 2014-02-05 12:54 UTC (permalink / raw)
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 <w530@pank.eu>
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 <alan.schmitt@polytechnique.org>
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---
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: I erroneously pushed a documentation patch to "maint"
2014-02-05 12:54 I erroneously pushed a documentation patch to "maint" Alan Schmitt
@ 2014-02-05 13:07 ` Bastien
0 siblings, 0 replies; 2+ messages in thread
From: Bastien @ 2014-02-05 13:07 UTC (permalink / raw)
To: Alan Schmitt; +Cc: emacs-orgmode
Hi Alan,
don't worry. ox-koma-letter.el is not yet part of Org core, so the
fix in maint will not go into Emacs 24.4. And since we are close to
merging master into maint (for 8.3), there is no real harm.
Best,
--
Bastien
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-02-05 13:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-05 12:54 I erroneously pushed a documentation patch to "maint" Alan Schmitt
2014-02-05 13:07 ` Bastien
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).