 		    [ "Find files #including a file"
 		      cscope-find-files-including-file t ]
 		    "-----------"
-		    [ "Next symbol"     cscope-next-symbol t ]
-		    [ "Next file"       cscope-next-file t ]
-		    [ "Previous symbol" cscope-prev-symbol t ]
-		    [ "Previous file"   cscope-prev-file t ]
-		    [ "Pop mark"        cscope-pop-mark t ]
+		    [ "Display *cscope* buffer" cscope-display-buffer t ]
+		    [ "Auto display *cscope* buffer toggle"
+		      cscope-display-buffer-toggle t ]
+		    [ "Next symbol"     	cscope-next-symbol t ]
+		    [ "Next file"       	cscope-next-file t ]
+		    [ "Previous symbol" 	cscope-prev-symbol t ]
+		    [ "Previous file"   	cscope-prev-file t ]
+		    [ "Pop mark"        	cscope-pop-mark t ]
 		    "-----------"
-		    [ "Set initial directory" cscope-set-initial-directory t ]
-		    [ "Unset initial directory"
-		      cscope-unset-initial-directory t ]
+		    ( "More ..."
+		      [ "Set initial directory"
+			cscope-set-initial-directory t ]
+		      [ "Unset initial directory"
+			cscope-unset-initial-directory t ]
+		      "-----------"
+		      [ "Create list of files to index"
+			cscope-create-list-of-files-to-index t ]
+		      [ "Create list and index"
+			cscope-index-files t ]
+		      [ "Edit list of files to index"
+			cscope-edit-list-of-files-to-index t ]
+		      [ "Locate this buffer's cscope directory"
+			cscope-tell-user-about-directory t ]
+		      [ "Dired this buffer's cscope directory"
+			cscope-dired-directory t ]
+		      )
 		    "-----------"
-		    [ "Create list of files to index"
-		      cscope-create-list-of-files-to-index t ]
-		    [ "Create list and index"
-		      cscope-index-files t ]
-		    [ "Edit list of files to index"
-		      cscope-edit-list-of-files-to-index t ]
-		    [ "Locate this buffer's cscope directory"
-		      cscope-tell-user-about-directory t ]
-		    [ "Dired this buffer's cscope directory"
-		      cscope-dired-directory t ]
-		    "-----------"
-		    [ "Auto edit single match" (setq cscope-edit-single-match
-						     (not cscope-edit-single-match))
-		      :style toggle :selected cscope-edit-single-match ]
-		    [ "Auto display *cscope* buffer"
-		      (setq cscope-display-cscope-buffer
-			    (not cscope-display-cscope-buffer))
-		      :style toggle :selected cscope-display-cscope-buffer ]
-		    [ "Stop at first matching database"
-		      (setq cscope-stop-at-first-match-dir
-			    (not cscope-stop-at-first-match-dir))
-		      :style toggle :selected cscope-stop-at-first-match-dir ]
-		    [ "Index recursively" (setq cscope-index-recursively
-						(not cscope-index-recursively))
-		      :style toggle :selected cscope-index-recursively ]
-		    [ "Suppress empty matches" (setq cscope-suppress-empty-matches
-						     (not cscope-suppress-empty-matches))
-		      :style toggle :selected cscope-suppress-empty-matches ]
-		    [ "Use relative paths" (setq cscope-use-relative-paths
-						 (not cscope-use-relative-paths))
-		      :style toggle :selected cscope-use-relative-paths ]
-		    [ "No mouse prompts" (setq cscope-no-mouse-prompts
-					       (not cscope-no-mouse-prompts))
-		      :style toggle :selected cscope-no-mouse-prompts ]
+		    ( "Options"
+		      [ "Auto edit single match"
+			(setq cscope-edit-single-match
+			      (not cscope-edit-single-match))
+			:style toggle :selected cscope-edit-single-match ]
+		      [ "Auto display *cscope* buffer"
+			(setq cscope-display-cscope-buffer
+			      (not cscope-display-cscope-buffer))
+			:style toggle :selected cscope-display-cscope-buffer ]
+		      [ "Stop at first matching database"
+			(setq cscope-stop-at-first-match-dir
+			      (not cscope-stop-at-first-match-dir))
+			:style toggle
+			:selected cscope-stop-at-first-match-dir ]
+		      [ "Never update cscope database"
+			(setq cscope-do-not-update-database
+			      (not cscope-do-not-update-database))
+			:style toggle :selected cscope-do-not-update-database ]
+		      [ "Index recursively"
+			(setq cscope-index-recursively
+			      (not cscope-index-recursively))
+			:style toggle :selected cscope-index-recursively ]
+		      [ "Suppress empty matches"
+			(setq cscope-suppress-empty-matches
+			      (not cscope-suppress-empty-matches))
+			:style toggle :selected cscope-suppress-empty-matches ]
+		      [ "Use relative paths"
+			(setq cscope-use-relative-paths
+			      (not cscope-use-relative-paths))
+			:style toggle :selected cscope-use-relative-paths ]
+		      [ "No mouse prompts" (setq cscope-no-mouse-prompts
+						 (not cscope-no-mouse-prompts))
+			:style toggle :selected cscope-no-mouse-prompts ] 
+		      )
 		    ))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

		(cscope-prompt-for-symbol
		 "Find functions called by this function: " nil)
		))
  (let ()
    (setq cscope-symbol symbol)
    (cscope-call (format "Finding functions called by: %s" symbol)
		 (list "-2" symbol) nil 'cscope-process-filter

  "The last symbol searched for.")


(defvar cscope-adjust t
  "True if the symbol searched for (cscope-symbol) should be on
the line specified by the cscope database.  In such cases the point will be
adjusted if need be (fuzzy matching).")


(defvar cscope-adjust-range 1000
  "How far the point should be adjusted if the symbol is not on the line
specified by the cscope database.")
