2009-09-02 Carsten Dominik <carsten.dominik@gmail.com>

	* org-protocol.el (org-protocol-store-link)
	(org-protocol-remember, org-protocol-open-source): Add autoloads.

	* org-compat.el (org-float-time): New function.

	* org.el (org-clock-update-time-maybe)
	(org-sort-entries-or-items, org-do-sort)
	(org-evaluate-time-range, org-time-string-to-seconds)
	(org-closed-in-range): Use `org-float-time'.

	* org-timer.el (org-timer-start, org-timer-pause-or-continue)
	(org-timer-seconds):  Use `org-float-time'.

	* org-clock.el (org-clock-get-clocked-time, org-clock-out)
	(org-clock-sum, org-dblock-write:clocktable)
	(org-clocktable-steps):  Use `org-float-time'.

	* org-agenda.el (org-agenda-last-marker-time)
	(org-agenda-new-marker, org-diary):  Use `org-float-time'.

	* org-compat.el (w32-focus-frame): Declare the w32-focus-frame
	function.

	* org-exp.el (org-get-file-contents): Only protect lines that
	really need it.

	* org-html.el (require): Require cl for compilation.

	* org.el:  Avoid using `default-major-mode'.

	* org-plot.el (require): Require CL only at compile time.

	* org-exp.el (require): Require CL only at compile time.

	* org-agenda.el (org-agenda-quit): When the agenda window is
	dedicated, remove other windows before exiting, so that the frame
	really will be killed.

	* org-exp.el (org-export-handle-include-files): Reset START and
	END for each loop cycle.

2009-09-02  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-eval-in-calendar): Use
	`org-select-frame-set-input-focus'.

	* org-compat.el (org-select-frame-set-input-focus): New function.

	* org.el (org-update-statistics-cookies): New function.
	(org-mode-map): Bind `C-c #' to `org-update-statistics-cookies'.

2009-09-02  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-src.el (org-edit-fixed-width-region): Set org-src-mode only
	after the local variables are set.

	* org-latex.el (org-export-latex-protect-amp): New function.
	(org-export-latex-links): Protect link ampersands in tables.

	* org-exp.el (org-export-select-backend-specific-text): Match in
	two steps, to avoid regexp problems.

	* org.el (org-offer-links-in-entry): Improve working with many and
	duplicate links.

	* org-agenda.el (org-agenda-show-1): Make more consistent with
	normal cycling.
	(org-agenda-cycle-show): Make more consistent with normal cycling.

	* org-gnus.el (org-gnus-store-link): Restore the linking to a
	website.

2009-09-02  Bastien Guerry  <bzg@altern.org>

	* org-latex.el (org-export-latex-first-lines): Bugfix.

2009-09-02  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-clock.el (org-clock-modify-effort-estimate): Emit message
	about new effort.

	* org.el (org-set-effort): New function.
	(org-mode-map): New key for effort setting command.

	* org-agenda.el (org-agenda): Keep window setup when calling
	agenda from within agenda window.
	(org-agenda-mode-map): New keys for effort setting commands.
	(org-agenda-menu): Add effort setting commands to menu.
	(org-agenda-set-property, org-agenda-set-effort): New functions.

	* org-latex.el (org-export-latex-tables): Fix
	`org-table-last-alignment' and `org-table-last-column-widths' if
	the first column has been removed.

2009-09-02  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-remove-timestamp-with-keyword): Only remove in
	entry, not in subtree.

	* org-src.el (org-src-lang-modes): Add abbreviation elisp for
	emacs lisp.

	* org.el (org-open-at-point): When on headline, offer all strings
	in entry.

	* org-remember.el (org-remember-templates): Documentation fix.

	* org.el (org-move-subtree-down): Use `org-get-next-sibling' and
	`org-get-last-sibling' instead of the outline versions of these
	functions.
	(org-get-last-sibling): New function.
	(org-refile): Use `org-get-next-sibling' instead of the outline
	version of this function.
	(org-clean-visibility-after-subtree-move): Use
	`org-get-next-sibling' and `org-get-last-sibling' instead of the
	outline versions of these functions.

2009-09-02  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-agenda.el (org-prepare-agenda): When creating a new frame
	for the agenda, make the window dedicated.

	* org-agenda.el (org-agenda-mode-map): New keys for time motion.

	* org-table.el (org-table-align): Change the order of reinsertion
	and deletion, to avoid problems with overlays following the table.

	* org.el (org-parse-time-string): Better error message.
	(org-show-subtree): Use org-end-of-subtree.

	* org-macs.el (org-goto-line): New defsubst.

	* org.el (org-open-file, org-change-tag-in-region)
	(org-fast-tag-show-exit): Don't use `goto-line'.

	* org-table.el (org-table-align, org-table-insert-column)
	(org-table-delete-column, org-table-move-column)
	(org-table-sort-lines, org-table-copy-region)
	(org-table-paste-rectangle, org-table-wrap-region)
	(org-table-get-specials, org-table-rotate-recalc-marks)
	(org-table-get-range, org-table-recalculate)
	(org-table-edit-formulas, org-table-fedit-convert-buffer)
	(org-table-show-reference, org-table-highlight-rectangle): Don't
	use `goto-line'.

	* org-src.el (org-edit-src-code, org-edit-fixed-width-region)
	(org-edit-src-exit): Don't use `goto-line'.

	* org-macs.el (org-preserve-lc): Don't use `goto-line'.

	* org-list.el (org-renumber-ordered-list, org-fix-bullet-type):
	Don't use `goto-line'.

	* org-exp.el (org-export-number-lines): Don't use `goto-line'.

	* org-colview.el (org-columns, org-columns-redo)
	(org-agenda-columns): Don't use `goto-line'.

	* org-colview-xemacs.el (org-columns, org-agenda-columns): Don't
	use `goto-line'.

	* org-agenda.el (org-agenda-mode): Force visual line motion off.
	(org-agenda-add-entry-text-maxlines): Improve docstring.
	(org-agenda-start-with-entry-text-mode): New option.
	(org-agenda-entry-text-maxlines): New option.
	(org-agenda-entry-text-mode): New variable.
	(org-agenda-mode): Set initial value of
	`org-agenda-entry-text-mode'.
	(org-agenda-mode-map): Add the `E' key.
	(org-agenda-menu): Add entry text mode to the menu.
	(org-agenda-get-some-entry-text): Fix line count bug.
	(org-finalize-agenda): Apply entry text mode if appropriate.
	(org-agenda-entry-text-show-here): New function.
	(org-agenda-entry-text-show): New function.
	(org-agenda-entry-text-hide): New function.
	(org-agenda-view-mode-dispatch): Add entry text mode to the view
	key menu.
	(org-agenda-entry-text-mode): New command.
	(org-agenda-set-mode-name): Add entry text mode to the mode line
	string.
	(org-agenda-undo, org-agenda-get-restriction-and-command)
	(org-agenda-get-some-entry-text, org-agenda-redo): Don't use
	`goto-line'.

2009-09-02  Bernt Hansen  <bernt@norang.ca>

	* org-clock.el (org-notify): Bugfix.

2009-09-02  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-agenda.el (org-agenda-open-link): Handle multiple links and
	check for after-string.

	* org-gnus.el (org-gnus-store-link): Simplify.

	* org.el (org-latex-regexps): Don't add extra empty lines for
	display formulas.

2009-09-02  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-agenda.el (org-agenda-get-some-entry-text): New function.
	(org-agenda-add-entry-text): Use
	`org-agenda-get-some-entry-text'.

	* org.el (org-cycle-separator-lines): Update docstring.
	(org-cycle-show-empty-lines): Handle negative values for
	`org-cycle-show-empty-lines'.

	* org-exp.el (org-export-protect-sub-super): New function.
	(org-export-normalize-links): Protect the url of plain links from
	supscript and superscript processing.

	* org-remember.el (org-remember-escaped-%): New function.
	(org-remember-apply-template): Use `org-remember-escaped-%' to
	detect escaped % signs.

2009-09-02  Bastien Guerry  <bzg@altern.org>

	* org-timer.el (org-timer-set-timer): Use `org-notify' and play a
	sound when showing the notification.

	* org-clock.el (org-notify): New function.
	(org-clock-notify-once-if-expired): Use `org-notify'.

	* org-gnus.el (org-gnus-store-link): Handle `gnus-summary-mode'
	and `gnus-article-mode' separately.
	(gnus-summary-article-header): Fix the declare-function.

2009-09-02  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-exp.el (org-export-format-source-code-or-example): Translate
	language.

	* org-src.el (org-src-lang-modes): New variable
	(org-edit-src-code): Translate language.

	* org-exp.el (org-export-format-source-code-or-example): Deal wit
	the new structure of the `org-export-latex-listings-langs'
	variable.

	* org-latex.el (org-export-latex-listings-langs): Change structure
	of the variable from plist to alist.

2009-09-02  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-in-commented-line): New function.

2009-09-02  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-hide-block-toggle): Make folded blocks searchable.

2009-09-02  Friedrich Delgado Friedrichs <friedel@nomaden.org>  (tiny change)

	* org.el (org-flag-drawer): More useful error.

2009-09-02  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-remember.el (org-remember-apply-template): Use
	org-icompleting-read.

	* org-publish.el (org-publish): Use org-icompleting-read.

	* org-colview.el (org-columns-edit-value, org-columns-new)
	(org-insert-columns-dblock): Use org-icompleting-read.

	* org-colview-xemacs.el (org-columns-edit-value)
	(org-columns-new, org-insert-columns-dblock): Use
	org-icompleting-read.

	* org-attach.el (org-attach-delete-one, org-attach-open): Use
	org-icompleting-read.

2009-09-02  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-hierarchical-todo-statistics): Improve docstring.
	(org-version): Return the version text.
	(org-org-menu): Add a menu entry for the new bug reporter.
	(org-submit-bug-report): New command.

	* org-list.el (org-hierarchical-checkbox-statistics): Improve
	docstring.

	* org.el (org-emphasis-regexp-components): Add "`" to set of
	pre-emphasis characters.

	* org-latex.el (org-export-latex-classes): Always include the soul
	package.
	(org-export-latex-emphasis-alist): Use \st for strikethough.

	* org-exp-blocks.el (org-export-blocks-preprocess): Use
	`indent-code-rigidly' to indent.

	* org-agenda.el (org-agenda-get-restriction-and-command): Remove
	properties only if MATCH really is a string.

2009-09-02  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-latex.el (org-export-latex-packages-alist): Fix
	customization type.

	* org.el (org-create-formula-image): Also use
	`org-export-latex-packages-alist'.

	* org-html.el (org-export-as-html): Fix bug in footnote regexp.
	(org-export-as-html): Format footnotes correctly.

2009-09-02  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-fast-tag-selection): Avoid text properties on tags
	in the alist.

	* org-agenda.el (org-agenda-get-restriction-and-command): Avoid
	text properties on the match element.

2009-09-02  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-set-regexps-and-options): Make sure the list of done
	keywords is not invalid.

	* org-exp.el (org-export-interpolate-newlines): New function.

2009-09-02  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-format-latex): Avoid nested overlays.

	* org-latex.el (org-export-latex-listings-langs): Add a few more
	languages.

	* org-exp.el (org-export-preprocess-apply-macros): Make sure to
	ignore newlines and space before the first macro argument.

	* org-latex.el (org-export-latex-tables): Remove save-excursion
	around `org-table-align'.

2009-09-02  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-export-html-special-string-regexps): Definition
	moved into org.el

	* org-exp.el (org-export-preprocess-apply-macros): Allow newlines
	in macro calls.

2009-09-02  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-latex.el (org-export-latex-listings)
	(org-export-latex-listings-langs): New options.

	* org-exp.el (org-export-format-source-code-or-example): Use
	listing package if requested by the user.

2009-09-02  Bastien Guerry  <bzg@altern.org>

	* org.el (org-iswitchb): Fix bug when aborting the `org-iswitchb'
	command before actually switching to a buffer.

2009-09-02  Carsten Dominik  <carsten.dominik@gmail.com>

	* org-exp.el (org-get-file-contents): Only quote org lines when
	the markup is src or example.

	* org-agenda.el (org-agenda-skip-scheduled-if-deadline-is-shown):
	New option
	(org-agenda-get-day-entries): Remember deadline results and pass
	them on into the function getting the scheduling information.
	(org-agenda-get-scheduled): Accept deadline results as parameters
	and maybe skip some entries.
	(org-agenda-skip-scheduled-if-deadline-is-shown): New option.

	* org.el (org-insert-heading): When respecting content, do not
	convert current line to headline.

	* org-clock.el (org-clock-save-markers-for-cut-and-paste): Also
	cheeeeeck the hd marker
	(org-clock-in): Also set the hd marker.
	(org-clock-out): Also set the hd marker.
	(org-clock-cancel): Reset markers.

	* org.el (org-clock-hd-marker): New marker.

	* org-faces.el (org-agenda-clocking): New face.

	* org-agenda.el (org-agenda-mark-clocking-task): New function.
	(org-finalize-agenda): call `org-agenda-mark-clocking-task'.

	* org.el (org-modules): Add org-track.el.

	* org-agenda.el (org-agenda-bulk-marked-p): New function.
	(org-agenda-bulk-mark, org-agenda-bulk-unmark): Use
	`org-agenda-bulk-marked-p'.
	(org-agenda-bulk-toggle): New command.

2009-09-02  Carsten Dominik  <carsten.dominik@gmail.com>

	* org.el (org-move-subtree-down): Hide subtree if it was folded,
	not just the body.

	* org-remember.el (org-remember-finalize): Avoid buffer-modified
	messages.

1 files changed, 76 insertions, 12 deletions

diff --git a/lisp/org/org-latex.el b/lisp/org/org-latex.el
index 896a0073190..48a7ac2878b 100644
--- a/lisp/org/org-latex.el
+++ b/lisp/org/org-latex.el
@@ -4,7 +4,7 @@
 ;;
 ;; Emacs Lisp Archive Entry
 ;; Filename: org-latex.el
-;; Version: 6.29c
+;; Version: 6.30c
 ;; Author: Bastien Guerry <bzg AT altern DOT org>
 ;; Maintainer: Carsten Dominik <carsten.dominik AT gmail DOT com>
 ;; Keywords: org, wp, tex
@@ -93,6 +93,7 @@
 \\usepackage[T1]{fontenc}
 \\usepackage{graphicx}
 \\usepackage{longtable}
+\\usepackage{soul}
 \\usepackage{hyperref}"
      ("\\section{%s}" . "\\section*{%s}")
      ("\\subsection{%s}" . "\\subsection*{%s}")
@@ -105,6 +106,7 @@
 \\usepackage[T1]{fontenc}
 \\usepackage{graphicx}
 \\usepackage{longtable}
+\\usepackage{soul}
 \\usepackage{hyperref}"
      ("\\part{%s}" . "\\part*{%s}")
      ("\\chapter{%s}" . "\\chapter*{%s}")
@@ -117,6 +119,7 @@
 \\usepackage[T1]{fontenc}
 \\usepackage{graphicx}
 \\usepackage{longtable}
+\\usepackage{soul}
 \\usepackage{hyperref}"
      ("\\part{%s}" . "\\part*{%s}")
      ("\\chapter{%s}" . "\\chapter*{%s}")
@@ -166,7 +169,7 @@ to represent the section title."
   '(("*" "\\textbf{%s}" nil)
     ("/" "\\emph{%s}" nil)
     ("_" "\\underline{%s}" nil)
-    ("+" "\\texttt{%s}" nil)
+    ("+" "\\st{%s}" nil)
     ("=" "\\verb" t)
     ("~" "\\verb" t))
   "Alist of LaTeX expressions to convert emphasis fontifiers.
@@ -245,9 +248,12 @@ When nil, grouping causes only separation lines between groups."
 
 (defcustom org-export-latex-packages-alist nil
   "Alist of packages to be inserted in the header.
-Each cell is of the forma \( \"option\" . \"package\" \)."
+Each cell is of the format \( \"option\" . \"package\" \)."
   :group 'org-export-latex
-  :type 'alist)
+  :type '(repeat
+	  (list
+	   (string :tag "option")
+	   (string :tag "package"))))
 
 (defcustom org-export-latex-low-levels 'itemize
   "How to convert sections below the current level of sectioning.
@@ -297,6 +303,43 @@ Defaults to \\begin{verbatim} and \\end{verbatim}."
   :type '(cons (string :tag "Open")
 	       (string :tag "Close")))
 
+(defcustom org-export-latex-listings nil
+  "Non-nil means, export source code using the listings package.
+This package will fontify source code, possibly even with color.
+If you want to use this, you also need to make LaTeX use the
+listings package, and if you want to have color, the color
+package.  Just add these 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 '(\"\" \"listings\"))
+  (add-to-list 'org-export-latex-packages-alist '(\"\" \"color\"))"
+  :group 'org-export-latex
+  :type 'boolean)
+
+(defcustom org-export-latex-listings-langs
+  '((emacs-lisp "Lisp") (lisp "Lisp")
+    (c "C") (cc "C++")
+    (fortran "fortran")
+    (perl "Perl") (cperl "Perl") (python "Python") (ruby "Ruby")
+    (html "HTML") (xml "XML")
+    (tex "TeX") (latex "TeX")
+    (shell-script "bash")
+    (gnuplot "Gnuplot")
+    (ocaml "Caml") (caml "Caml")
+    (sql "SQL"))
+  "Alist mapping languages to their listing language counterpart.
+The key is a symbol, the major mode symbol without the \"-mode\".
+The value is the string that should be inserted as the language parameter
+for the listings package.  If the mode name and the listings name are
+the same, the language does not need an entry in this list - but it does not
+hurt if it is present."
+  :group 'org-export-latex
+  :type '(repeat
+	  (list
+	   (symbol :tag "Major mode       ")
+	   (string :tag "Listings language"))))
+
 (defcustom org-export-latex-remove-from-headlines
   '(:todo nil :priority nil :tags nil)
   "A plist of keywords to remove from headlines. OBSOLETE.
@@ -960,10 +1003,11 @@ If BEG is non-nil, it is the beginning of the region.
 If END is non-nil, it is the end of the region."
   (save-excursion
     (goto-char (or beg (point-min)))
-    (let* ((pt (point))
-	   (end (if (re-search-forward "^\\*+ " end t)
-		    (goto-char (match-beginning 0))
-		  (goto-char end))))
+    (let* ((pt (point)))
+      (or end
+	  (and (re-search-forward "^\\*+ " end t)
+	       (setq end (match-beginning 0)))
+	  (setq end (point-max)))
       (prog1
 	  (org-export-latex-content
 	   (org-export-preprocess-string
@@ -1276,16 +1320,19 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
 
 
 (defvar org-table-last-alignment) ; defined in org-table.el
+(defvar org-table-last-column-widths) ; defined in org-table.el
 (declare-function orgtbl-to-latex "org-table" (table params) t)
 (defun org-export-latex-tables (insert)
   "Convert tables to LaTeX and INSERT it."
   (goto-char (point-min))
   (while (re-search-forward "^\\([ \t]*\\)|" nil t)
-    ;; FIXME really need to save-excursion?
-    (save-excursion (org-table-align))
+    (org-table-align)
     (let* ((beg (org-table-begin))
 	   (end (org-table-end))
 	   (raw-table (buffer-substring beg end))
+	   (org-table-last-alignment (copy-sequence org-table-last-alignment))
+	   (org-table-last-column-widths (copy-sequence
+					  org-table-last-column-widths))
 	   fnum fields line lines olines gr colgropen line-fmt align
 	   caption label attr floatp longtblp)
       (if org-export-latex-tables-verbatim
@@ -1310,6 +1357,9 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
 	  (apply 'delete-region (list beg end))
 	  (when org-export-table-remove-special-lines
 	    (setq lines (org-table-clean-before-export lines 'maybe-quoted)))
+	  (when org-table-clean-did-remove-column
+	      (pop org-table-last-alignment)
+	      (pop org-table-last-column-widths))
 	  ;; make a formatting string to reflect aligment
 	  (setq olines lines)
 	  (while (and (not line-fmt) (setq line (pop olines)))
@@ -1521,10 +1571,24 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
 	     ((not type)
 	      (insert (format "\\hyperref[%s]{%s}"
 			      (org-remove-initial-hash
-			       (org-solidify-link-text raw-path)) desc)))
-	     (path (insert (format "\\href{%s}{%s}" path desc)))
+			       (org-solidify-link-text raw-path))
+			      desc)))
+	     (path 
+	      (when (org-at-table-p)
+		;; There is a strange problem when we have a link in a table,
+		;; ampersands then cause a problem.  I think this must be
+		;; a LaTeX issue, but we here implement a work-around anyway.
+		(setq path (org-export-latex-protect-amp path)
+		      desc (org-export-latex-protect-amp desc)))
+	      (insert (format "\\href{%s}{%s}" path desc)))
 	     (t (insert "\\texttt{" desc "}")))))))
 
+(defun org-export-latex-protect-amp (s)
+  (while (string-match "\\([^\\\\]\\)\\(&\\)" s)
+    (setq s (replace-match (concat (match-string 1 s) "\\" (match-string 2 s))
+			   t t s)))
+  s)
+
 (defun org-remove-initial-hash (s)
   (if (string-match "\\`#" s)
       (substring s 1)