Merge branch 'master' of orgmode.org:org-mode

doc/org.texi

@@ -371,11 +371,6 @@ Visibility cycling
 * Initial visibility::          Setting the initial visibility state
 * Catching invisible edits::    Preventing mistakes when editing invisible parts
 
-Global and local cycling
-
-* Initial visibility::          Setting the initial visibility state
-* Catching invisible edits::    Preventing mistakes when editing invisible parts
-
 Tables
 
 * Built-in table editor::       Simple tables
@@ -1315,11 +1310,6 @@ the previously used indirect buffer.
 Copy the @i{visible} text in the region into the kill ring.
 @end table
 
-@menu
-* Initial visibility::          Setting the initial visibility state
-* Catching invisible edits::    Preventing mistakes when editing invisible parts
-@end menu
-
 @node Initial visibility
 @subsection Initial visibility
 

lisp/org.el

@@ -7970,14 +7970,10 @@ The level is the number of stars at the beginning of the headline."
   "Return the outline depth of the last headline before the current line.
 Returns 0 for the first headline in the buffer, and nil if before the
 first headline."
-  (let ((current-level (org-current-level))
-	(prev-level (when (> (line-number-at-pos) 1)
-		      (save-excursion
-			(beginning-of-line 0)
-			(org-current-level)))))
-    (cond ((null current-level) nil) ; Before first headline
-	  ((null prev-level) 0)      ; At first headline
-	  (prev-level))))
+  (and (org-current-level)
+       (or (and (/= (line-beginning-position) (point-min))
+		(save-excursion (beginning-of-line 0) (org-current-level)))
+	   0)))
 
 (defun org-reduced-level (l)
   "Compute the effective level of a heading.

lisp/ox-html.el

@@ -650,8 +650,8 @@ The function result will be used in the section format string."
 
 (defcustom org-html-allow-name-attribute-in-anchors nil
   "When nil, do not set \"name\" attribute in anchors.
-By default, anchors are formatted with both \"id\" and \"name\"
-attributes, when appropriate."
+By default, when appropriate, anchors are formatted with \"id\"
+but without \"name\" attribute."
   :group 'org-export-html
   :version "24.4"
   :package-version '(Org . "8.0")
@@ -988,25 +988,27 @@ org-info.js for your website."
 	  (trans . "<input type='checkbox' />"))))
   "Alist of checkbox types.
 The cdr of each entry is an alist list three checkbox types for
-html export: \"on\", \"off\" and \"trans\".
+HTML export: `on', `off' and `trans'.
 
 The choices are:
-  - unicode characters (html entities)
-  - ascii characters
-  - html checkboxes
-Note that only the ascii characters implement tri-state
-checkboxes. The other two use the \"off\" checkbox for \"trans\".")
+  `unicode' Unicode characters (HTML entities)
+  `ascii'   ASCII characters
+  `html'    HTML checkboxes
 
-(defcustom org-html-checkbox-type "ascii"
-  "The type of checkboxes to use for html export. See
-`org-html-checkbox-types' for for the values used for each option."
+Note that only the ascii characters implement tri-state
+checkboxes. The other two use the `off' checkbox for `trans'.")
+
+(defcustom org-html-checkbox-type 'ascii
+  "The type of checkboxes to use for HTML export.
+See `org-html-checkbox-types' for for the values used for each
+option."
   :group 'org-export-html
   :version "24.4"
   :package-version '(Org . "8.0")
   :type '(choice
-	  (const :tag "ASCII characters" "ascii")
-	  (const :tag "Unicode characters" "unicode")
-	  (const :tag "HTML checkboxes" "html")))
+	  (const :tag "ASCII characters" ascii)
+	  (const :tag "Unicode characters" unicode)
+	  (const :tag "HTML checkboxes" html)))
 
 (defcustom org-html-metadata-timestamp-format "%Y-%m-%d %a %H:%M"
   "Format used for timestamps in preamble, postamble and metadata.
@@ -2451,12 +2453,11 @@ contextual information."
 ;;;; Item
 
 (defun org-html-checkbox (checkbox info)
-  "Format CHECKBOX into HTML.  INFO is a plist holding contextual
-information.
-See `org-html-checkbox-type' for customization options."
-  (cdr (assoc checkbox
-	      (cdr (assoc (intern org-html-checkbox-type)
-			  org-html-checkbox-types)))))
+  "Format CHECKBOX into HTML.
+INFO is a plist holding contextual information.  See
+`org-html-checkbox-type' for customization options."
+  (cdr (assq checkbox
+	     (cdr (assq org-html-checkbox-type org-html-checkbox-types)))))
 
 (defun org-html-format-list-item (contents type checkbox info
 					     &optional term-counter-id