Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

Conflicts:
	ORGWEBPAGE/Changes.org

ORGWEBPAGE/Changes.org

@@ -158,9 +158,13 @@ on Worg.
 From the agenda, `J' invokes =org-agenda-clock-goto=.
 *** Fontify code in code blocks.
 
-Source code in code block can now be fontified.  Please customize
-the varable =org-src-fontify-natively=, but be prepared for some
-editing delays in large blocks.  Thanks to Dan Davison for this.
+Source code in code blocks can now be fontified.  Please customize the
+varable =org-src-fontify-natively=. For very large blocks (several
+hundreds of lines) there can be delays in editing such fontified
+blocks, in which case C-c ' should be used to bring up a dedicated
+edit buffer.
+
+Thanks to Dan Davison for this.
 
 *** Allow "#" and "%" in tags
 
@@ -371,6 +375,17 @@ agenda.
 
 Thanks to Lukasz Setmann for a patch to this effect.
 
+<<<<<<< HEAD
+=======
+*** Table fields are now aligned better, new <c> cookie.
+
+In HTML export, table fields are now properly aligned in accord
+with automatic alignment in org, or as set by the =<r>=, =<l>=, and
+=<c>= cookies.  The =<c>= cookie is new and has no effect in
+Org, but it does do the right thing in HTML export.  A LaTeX export
+implementation will follow, but is currently still missing.
+
+>>>>>>> 4f429f5ffbb77dd34e02112416dadbd558079180
 *** Update freemind converter to include body text
 
 The freemind exporter now incorporates body text into the mind
@@ -402,14 +417,35 @@ Thanks to Matthias Danzl for showing how to do this.
 Indentation in inline tasks, and headline insertion after inline
 tasks now behave as expected.
 
+<<<<<<< HEAD
+=======
+*** Encryption in MobileOrg finally works
+
+As soon as MobilOrg 1.5 hits the Apple's AppStore, you can
+encrypt your org files on public servers.  Please see the
+documentation of MobileOrg and Appendix B of the manual for more
+details.
+    
+*** MobileOrg: Do not force to insert IDs
+
+If you dislike the property of MobileOrg to insert ID properties
+for in all entries being part of an agenda view, you can now turn
+this off using the variable
+=org-mobile-force-id-on-agenda-items=.  When this variable is set
+to =nil=, MobileOrg will use outline paths to identify entries.
+Note that this may fail if several entries have identical outline
+paths.
+
+>>>>>>> 4f429f5ffbb77dd34e02112416dadbd558079180
 *** LaTeX minted package for fontified source code export
 Patch by Dan Davison.
 
-A non-nil value of `org-export-latex-minted' means to export source
-code using the minted package, which will fontify source code
-with color.  If you want to use this, you need to make LaTeX use the
-minted package. Add minted to `org-export-latex-packages-alist', for
-example using customize, or with something like
+Setting `org-export-latex-listings' to have the special value 'minted
+causes source code to be exported to latex using the minted package,
+which will fontify source code with color.  If you want to use this,
+you need to make LaTeX use the minted package. Add minted to
+`org-export-latex-packages-alist', for example using customize, or
+with something like
 
   (require 'org-latex)
   (add-to-list 'org-export-latex-packages-alist '("" "minted"))

doc/org.texi

@@ -1708,8 +1708,7 @@ unpredictable for you, configure the variables
 
 @table @kbd
 @tsubheading{Creation and conversion}
-@kindex C-c |
-@item C-c |
+@orgcmd{C-c |,org-table-create-or-convert-from-region}
 Convert the active region to table. If every line contains at least one
 TAB character, the function assumes that the material is tab separated.
 If every line contains a comma, comma-separated values (CSV) are assumed.
@@ -1723,16 +1722,14 @@ table.  But it's easier just to start typing, like
 @kbd{|Name|Phone|Age @key{RET} |- @key{TAB}}.
 
 @tsubheading{Re-aligning and field motion}
-@kindex C-c C-c
-@item C-c C-c
+@orgcmd{C-c C-c,org-ctrl-c-ctrl-c}
 Re-align the table without moving the cursor.
 @c
 @orgcmd{<TAB>,org-cycle}
 Re-align the table, move to the next field.  Creates a new row if
 necessary.
 @c
-@kindex S-@key{TAB}
-@item S-@key{TAB}
+@orgcmd{S-@key{TAB},org-shifttab}
 Re-align, move to previous field.
 @c
 @kindex @key{RET}

lisp/org-exp.el

@@ -607,7 +607,6 @@ table.el tables."
     (:TeX-macros	      "TeX"	  org-export-with-TeX-macros)
     (:LaTeX-fragments	      "LaTeX"	  org-export-with-LaTeX-fragments)
     (:latex-listings	      nil         org-export-latex-listings)
-    (:latex-minted	      nil         org-export-latex-minted)
     (:skip-before-1st-heading "skip"	  org-export-skip-text-before-1st-heading)
     (:fixed-width	      ":"	  org-export-with-fixed-width)
     (:timestamps	      "<"	  org-export-with-timestamps)
@@ -2235,7 +2234,6 @@ in the list) and remove property and value from the list in LISTVAR."
 (defvar org-export-latex-listings) ;; defined in org-latex.el
 (defvar org-export-latex-listings-langs) ;; defined in org-latex.el
 (defvar org-export-latex-listings-w-names) ;; defined in org-latex.el
-(defvar org-export-latex-minted) ;; defined in org-latex.el
 (defvar org-export-latex-minted-langs) ;; defined in org-latex.el
 (defvar org-export-latex-minted-with-line-numbers) ;; defined in org-latex.el
 
@@ -2368,7 +2366,8 @@ INDENT was the original indentation of the block."
 	      (concat "#+BEGIN_LaTeX\n"
 		      (org-add-props
                           (cond
-			   (org-export-latex-listings
+			   ((and org-export-latex-listings
+				 (not (eq org-export-latex-listings 'minted)))
 			    (concat
 			     (if lang
 				 (let*
@@ -2388,7 +2387,7 @@ INDENT was the original indentation of the block."
 					"_" "\\\\_" caption)))
 			     "\\begin{lstlisting}\n"
 			     rtn "\\end{lstlisting}\n"))
-			   (org-export-latex-minted
+			   ((eq org-export-latex-listings 'minted)
 			    (if lang
 				(let*
 				    ((lang-sym (intern lang))

lisp/org-latex.el

@@ -376,7 +376,25 @@ for example using customize, or with something like
 
   (require 'org-latex)
   (add-to-list 'org-export-latex-packages-alist '(\"\" \"listings\"))
-  (add-to-list 'org-export-latex-packages-alist '(\"\" \"color\"))"
+  (add-to-list 'org-export-latex-packages-alist '(\"\" \"color\"))
+
+Alternatively,
+
+  (setq org-export-latex-listings 'minted)
+
+causes source code to be exported using the minted package as
+opposed to listings. If you want to use minted, you need to add
+the minted package to `org-export-latex-packages-alist', for
+example using customize, or with
+
+  (require 'org-latex)
+  (add-to-list 'org-export-latex-packages-alist '(\"\" \"minted\"))
+
+In addition, it is neccessary to install
+pygments (http://pygments.org), and to configure
+`org-latex-to-pdf-process' so that the -shell-escape option is
+passed to pdflatex.
+"
   :group 'org-export-latex
   :type 'boolean)
 
@@ -411,23 +429,6 @@ of noweb."
   :group 'org-export-latex
   :type 'boolean)
 
-(defcustom org-export-latex-minted nil
-  "Non-nil means export source code using the minted package.
-This package will fontify source code with color.
-If you want to use this, you need to make LaTeX use the
-minted package. Add this to `org-export-latex-packages-alist',
-for example using customize, or with something like
-
-  (require 'org-latex)
-  (add-to-list 'org-export-latex-packages-alist '(\"\" \"minted\"))
-
-In addition, it is neccessary to install
-pygments (http://pygments.org), and configure
-`org-latex-to-pdf-process' so that the -shell-escape option is
-passed to pdflatex."
-  :group 'org-export-latex
-  :type 'boolean)
-
 (defcustom org-export-latex-minted-langs
   '((emacs-lisp "common-lisp")
     (cc "c++")