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

doc/ChangeLog

@@ -1,3 +1,8 @@
+2010-05-10  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org.texi (The date/time prompt): Document the new keys `C-v'
+	and `M-v'.
+
 2010-05-08  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* orgcard.tex: Document inline image toggling.

doc/org.texi

@@ -5173,6 +5173,8 @@ from the minibuffer:
 
 @kindex <
 @kindex >
+@kindex M-v
+@kindex C-v
 @kindex mouse-1
 @kindex S-@key{right}
 @kindex S-@key{left}
@@ -5182,12 +5184,13 @@ from the minibuffer:
 @kindex M-S-@key{left}
 @kindex @key{RET}
 @example
-> / <          @r{Scroll calendar forward/backward by one month.}
+@key{RET}           @r{Choose date at cursor in calendar.}
 mouse-1        @r{Select date by clicking on it.}
 S-@key{right}/@key{left}     @r{One day forward/backward.}
 S-@key{down}/@key{up}     @r{One week forward/backward.}
 M-S-@key{right}/@key{left}   @r{One month forward/backward.}
-@key{RET}           @r{Choose date in calendar.}
+> / <          @r{Scroll calendar forward/backward by one month.}
+M-v / C-v      @r{Scroll calendar forward/backward by 3 months.}
 @end example
 
 @vindex org-read-date-display-live

doc/orgcard.tex

@@ -444,34 +444,37 @@ formula, \kbd{:=} a field formula.
 \key{edit code snippet of file at point}{C-c '}
 \key{toggle inline display of linked images}{C-c C-x C-v}
 
-{\bf Internal Links}
-
-\key{\kbd{<<My Target>>}}{\rm target}
-\key{\kbd{<<<My Target>>>}}{\rm radio target$^2$}
-\key{\kbd{[[*this text]]}}{\rm find headline}
-\metax{\kbd{[[this text]]}}{\rm find target or text in buffer}
-\metax{\kbd{[[this text][description]]}}{\rm optional link text}
-
-{\bf External Links}
-
-\key{\kbd{file:/home/dominik/img/mars.jpg}}{\rm file, absolute}
-\key{\kbd{file:papers/last.pdf}}{\rm file, relative}
-\key{\kbd{file:projects.org::*that text}}{\rm find headline}
-\key{\kbd{file:projects.org::find me}}{\rm find trgt/string}
-%\key{\kbd{file:projects.org::/regexp/}}{\rm regexp search}
-\key{\kbd{http://www.astro.uva.nl/~dominik}}{\rm on the web}
-\key{\kbd{mailto:adent@galaxy.net}}{\rm Email address}
-\key{\kbd{news:comp.emacs}}{\rm Usenet group}
-\key{\kbd{bbdb:Richard Stallman}}{\rm BBDB person}
-\key{\kbd{gnus:group}}{\rm GNUS group}
-\key{\kbd{gnus:group\#id}}{\rm GNUS message}
-\key{\kbd{vm|wl|mhe|rmail:folder}}{\rm Mail folder}
-\key{\kbd{vm|wl|mhe|rmail:folder\#id}}{\rm Mail message}
-\key{\kbd{info:emacs:Regexps}}{\rm Info file:node}
-\key{\kbd{shell:ls *.org}}{\rm shell command}
-\key{\kbd{elisp:(calendar)}}{\rm elisp form}
-\metax{\kbd{[[external link][description]]}}{\rm optional link text}
-%\key{\kbd{vm://myself@some.where.org/folder\#id}}{\rm VM remote}
+% {\bf Internal Links}
+
+% \key{\kbd{<<My Target>>}}{\rm target}
+% \key{\kbd{<<<My Target>>>}}{\rm radio target$^2$}
+% \key{\kbd{[[*this text]]}}{\rm find headline}
+% \metax{\kbd{[[this text]]}}{\rm find target or text in buffer}
+% \metax{\kbd{[[this text][description]]}}{\rm optional link text}
+
+% {\bf External Links}
+
+% \key{\kbd{file:/home/dominik/img/mars.jpg}}{\rm file, absolute}
+% \key{\kbd{file:papers/last.pdf}}{\rm file, relative}
+% \key{\kbd{file:projects.org::*that text}}{\rm find headline}
+% \key{\kbd{file:projects.org::find me}}{\rm find trgt/string}
+% %\key{\kbd{file:projects.org::/regexp/}}{\rm regexp search}
+% \key{\kbd{http://www.astro.uva.nl/~dominik}}{\rm on the web}
+% \key{\kbd{mailto:adent@galaxy.net}}{\rm Email address}
+% \key{\kbd{news:comp.emacs}}{\rm Usenet group}
+% \key{\kbd{bbdb:Richard Stallman}}{\rm BBDB person}
+% \key{\kbd{gnus:group}}{\rm GNUS group}
+% \key{\kbd{gnus:group\#id}}{\rm GNUS message}
+% \key{\kbd{vm|wl|mhe|rmail:folder}}{\rm Mail folder}
+% \key{\kbd{vm|wl|mhe|rmail:folder\#id}}{\rm Mail message}
+% \key{\kbd{info:emacs:Regexps}}{\rm Info file:node}
+% \key{\kbd{shell:ls *.org}}{\rm shell command}
+% \key{\kbd{elisp:(calendar)}}{\rm elisp form}
+% \metax{\kbd{[[external link][description]]}}{\rm optional link text}
+% %\key{\kbd{vm://myself@some.where.org/folder\#id}}{\rm VM remote}
+
+\section{Working with Source Code (Babel)}
+
 
 
 % \section{Remember-mode Integration}

lisp/ChangeLog

@@ -1,3 +1,9 @@
+2010-05-10  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org.el (org-replace-escapes): Make sure the cdr is not nil.
+	(org-read-date): Make `M-v' and `C-v' scroll the popup calendar.
+	(org-mode): Revert comment syntax changes.
+
 2010-05-09  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org.el (org-sparse-tree): Make `C-c / t' search for all TODO

lisp/org-latex.el

@@ -580,8 +580,8 @@ non-nil, create a buffer with that name and export to that
 buffer.  If TO-BUFFER is the symbol `string', don't leave any
 buffer behind but just return the resulting LaTeX as a string.
 When BODY-ONLY is set, don't produce the file header and footer,
-simply return the content of \begin{document}...\end{document},
-without even the \begin{document} and \end{document} commands.
+simply return the content of \\begin{document}...\\end{document},
+without even the \\begin{document} and \\end{document} commands.
 when PUB-DIR is set, use this as the publishing directory."
   (interactive "P")
   (when (and (not body-only) arg (listp arg)) (setq body-only t))

lisp/org.el

@@ -4449,10 +4449,10 @@ The following commands are available:
 		 'org-block-todo-from-checkboxes))
 
   ;; Comment characters
-  (org-set-local 'comment-start "#")
+  ;; (org-set-local 'comment-start "#")
   (org-set-local 'comment-padding " ")
   (modify-syntax-entry ?# "<")
-  (modify-syntax-entry ?\n ">")
+  ;; (modify-syntax-entry ?\n ">")
 
   ;; Align options lines
   (org-set-local
@@ -13670,6 +13670,14 @@ user."
 	    (org-defkey minibuffer-local-map "<"
 			(lambda () (interactive)
 			  (org-eval-in-calendar '(scroll-calendar-right 1))))
+	    (org-defkey minibuffer-local-map "\C-v"
+			(lambda () (interactive)
+			  (org-eval-in-calendar
+			   '(calendar-scroll-left-three-months 1))))
+	    (org-defkey minibuffer-local-map "\M-v"
+			(lambda () (interactive)
+			  (org-eval-in-calendar
+			   '(calendar-scroll-right-three-months 1))))
 	    (run-hooks 'org-read-date-minibuffer-setup-hook)
 	    (unwind-protect
 		(progn
@@ -17700,7 +17708,7 @@ so values can contain further %-escapes if they are define later in TABLE."
         e re rpl)
     (while (setq e (pop tbl))
       (setq re (concat "%-?[0-9.]*" (substring (car e) 1)))
-      (when (string-match re (cdr e))
+      (when (and (cdr e) (string-match re (cdr e)))
         (let ((sref (substring (cdr e) (match-beginning 0) (match-end 0)))
               (safe "SREF"))
           (add-text-properties 0 3 (list 'sref sref) safe)