Browse Source

org.el: Fix `org-display-outline-path' (see commit 979567)

* org.el (org-format-outline-path): Small docstring
enhancement.
(org-display-outline-path): Fix order or arguments.
Bastien Guerry 13 years ago
parent
commit
1b53c705de
1 changed files with 5 additions and 6 deletions
  1. 5 6
      lisp/org.el

+ 5 - 6
lisp/org.el

@@ -10841,8 +10841,8 @@ avoiding backtracing.  Refile target collection makes use of that."
 WIDTH is the maximum number of characters that is available.
 WIDTH is the maximum number of characters that is available.
 PREFIX is a prefix to be included in the returned string,
 PREFIX is a prefix to be included in the returned string,
 such as the file name.
 such as the file name.
-SEPARATOR is inserted between the different parts of the path, the default
-is \"/\"."
+SEPARATOR is inserted between the different parts of the path,
+the default is \"/\"."
   (setq width (or width 79))
   (setq width (or width 79))
   (if prefix (setq width (- width (length prefix))))
   (if prefix (setq width (- width (length prefix))))
   (if (not path)
   (if (not path)
@@ -10876,8 +10876,7 @@ is \"/\"."
 		 h)
 		 h)
 	       path (or separator "/"))))))
 	       path (or separator "/"))))))
 
 
-(defun org-display-outline-path (&optional file current separator
-					   just-return-string)
+(defun org-display-outline-path (&optional file current separator just-return-string)
   "Display the current outline path in the echo area.
   "Display the current outline path in the echo area.
 
 
 If FILE is non-nil, prepend the output with the file name.
 If FILE is non-nil, prepend the output with the file name.
@@ -10899,8 +10898,8 @@ If JUST-RETURN-STRING is non-nil, return a string, don't display a message."
 	  (org-format-outline-path
 	  (org-format-outline-path
 	   path
 	   path
 	   (1- (frame-width))
 	   (1- (frame-width))
-	   separator
-	   (and file bfn (concat (file-name-nondirectory bfn) separator))))
+	   (and file bfn (concat (file-name-nondirectory bfn) separator))
+	   separator))
     (if just-return-string
     (if just-return-string
 	(org-no-properties res)
 	(org-no-properties res)
       (message "%s" res))))
       (message "%s" res))))