Merge from emacs-24; up to 2013-01-03T02:37:57Z!rgm@gnu.org

[gnu-emacs] / lisp / org / org-ctags.el

diff --git a/lisp/org/org-ctags.el b/lisp/org/org-ctags.el
index 833c1dd6c1eaab6f7266fe8da83b05bfe30cb8d2..9d8ed6c62b309a27873cf3566deb29bd50f34ce3 100644 (file)
--- a/lisp/org/org-ctags.el
+++ b/lisp/org/org-ctags.el
@@ -131,7 +131,7 @@
 ;;
 ;;     (progn
 ;;       (message "-- rebuilding tags tables...")
-;;       (mapc 'org-create-tags tags-table-list))
+;;       (mapc 'org-ctags-create-tags tags-table-list))
 
 ;;; Code:
 
@@ -156,11 +156,8 @@ Format is: /REGEXP/TAGNAME/FLAGS,TAGTYPE/
 See the ctags documentation for more information.")
 
 (defcustom org-ctags-path-to-ctags
-  (case system-type
-    (windows-nt "ctags.exe")
-    (darwin "ctags-exuberant")
-    (t "ctags-exuberant"))
-  "Full path to the ctags executable file."
+  (if (executable-find "ctags-exuberant") "ctags-exuberant" "ctags")
+  "Name of the ctags executable file."
   :group 'org-ctags
   :version "24.1"
   :type 'file)