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

ORGWEBPAGE/Changes.org

@@ -44,7 +44,7 @@
       variable is associated with the =:style= property and can
       be used to establish project-wide settings.
     - There is a new variable =org-export-html-style-extra= that
-      should be used for file-local setings.  Org-publish can, if
+      should be used for file-local settings.  Org-publish can, if
       necessary, access this variable with the =:style-extra=
       property.
     - When a file is published, the values of 
@@ -56,6 +56,18 @@
 
     This follows a proposal by Rustom Mody.
 
+*** Attributes in hyperlinks
+    You can now set attributes in hyperlinks that will be used
+    when publishing to HTML.  For example, if you want to use the
+    ALT and TITLE attributes of an inlined image, here is who to
+    do this:
+
+    : [[./img/a.jpg{{alt="This is image A" title="Image with no action"}}] ]
+
+**** TODO Fix link export in examples.
+     For some reason these are processed even though they are in
+     an exmple region. 
+
 *** A way to compare times during a property search
     If the comparison value in a property search is a string that
     is enclosed in angular brackets, a time comparison will be
@@ -71,7 +83,7 @@
 
 *** Simplified way to specify file links
 
-    In a link, you can now leave uout the "file:" prefix if you
+    In a link, you can now leave out the "file:" prefix if you
     write an absolute file name like =/Users/dominik/.emacs= or
  =~/.emacs=, or if you write a relative file name by using
  =./= or =../= to start the file path.  You cannot write a
@@ -115,12 +127,17 @@
 
 *** New option :index-style for org-publish
     This option can be used to switch the style of the index
-    produced by org-publish.
+    produced by org-publish.  Can be `list' (index is just an
+    itemized list of the titles of the files involved) or `tree'
+    (the directory structure of the source files is reflected in
+    the index).  Defaults to `tree'.
 
 *** New option `org-open-directory-means-index'
     When set, a link pointing to a directory will actually open
     the index.org file in that directory.  This is a good setting
-    inside a publishing project.
+    inside a publishing project.  When not set, you get a
+    finder/explorer window for that directory, or dired,
+    depending on system and setup.
 
 * Version 6.05
 

lisp/org.el

@@ -9263,9 +9263,9 @@ only lines with a TODO keyword are included in the output."
 		     (mapconcat 'regexp-quote org-todo-keywords-1 "\\|")
 		     (org-re
 		      "\\>\\)\\)? *\\(.*?\\)\\(:[[:alnum:]_@:]+:\\)?[ \t]*$")))
-	 (props (list 'face nil
+	 (props (list 'face 'default
 		      'done-face 'org-done
-		      'undone-face nil
+		      'undone-face 'default
 		      'mouse-face 'highlight
 		      'org-not-done-regexp org-not-done-regexp
 		      'org-todo-regexp org-todo-regexp
@@ -12517,7 +12517,9 @@ The images can be removed again with \\[org-ctrl-c-ctrl-c]."
 
 (org-defkey org-mode-map "\C-c\C-a" 'show-all)  ; in case allout messed up.
 (org-defkey org-mode-map "\C-c\C-r" 'org-reveal)
-(org-defkey narrow-map "s" 'org-narrow-to-subtree)
+(if (boundp 'narrow-map)
+    (org-defkey narrow-map "s" 'org-narrow-to-subtree)
+  (org-defkey org-mode-map "\C-xns" 'org-narrow-to-subtree))
 (org-defkey org-mode-map "\C-c$"    'org-archive-subtree)
 (org-defkey org-mode-map "\C-c\C-x\C-s" 'org-advertized-archive-subtree)
 (org-defkey org-mode-map "\C-c\C-x\C-a" 'org-toggle-archive-tag)