2002-02-17 Per Abrahamsen <abraham@dina.kvl.dk>

	* menu-bar.el (menu-bar-showhide-menu): Added speedbar.
	(menu-bar-tools-menu): Removed speedbar.

	* textmodes/ispell.el (ispell-menu-map): Added `customize-ispell'
	and `flyspell-mode' entries.

	* textmodes/flyspell.el (flyspell): Add to ispell group.

5 files changed, 32 insertions, 3 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 76eed7c383e..c4456e5c119 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -87,6 +87,8 @@ scroll bar to either side here or turn it off completely.  There is also
 a menu-item to toggle displaying of current date and time, current line
 and column number in the mode-line.
 
+** Speedbar has moved from the "Tools" top level menu to "Show/Hide".
+
 ** Emacs can now indicate in the mode-line the presence of new e-mails in
 directory in addition to file.  See the documentation of the user option
 `display-time-mail-directory'.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 862a1c46b49..47307871181 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2002-02-17  Per Abrahamsen  <abraham@dina.kvl.dk>
+
+        * menu-bar.el (menu-bar-showhide-menu): Added speedbar.
+        (menu-bar-tools-menu): Removed speedbar.
+
+        * textmodes/ispell.el (ispell-menu-map): Added `customize-ispell'
+        and `flyspell-mode' entries.
+
+        * textmodes/flyspell.el (flyspell): Add to ispell group.
+
 2002-02-17  Kai Gro,A_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
         * emacs-lisp/lisp.el (mark-sexp): Don't leave multiple marks when
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 12656013408..e6814a4e76c 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -626,6 +626,15 @@ Do the same for the keys of the same name."
 (define-key menu-bar-showhide-menu [datetime-separator]
   '("--"))
 
+(define-key menu-bar-showhide-menu [showhide-speedbar]
+  '(menu-item "Speedbar" speedbar-frame-mode
+              :help "Display speedbar"
+              :button (:toggle
+                       . (and (boundp 'speedbar-frame)
+                              (frame-live-p (symbol-value 'speedbar-frame))
+                              (frame-visible-p 
+                               (symbol-value 'speedbar-frame))))))
+
 (defvar menu-bar-showhide-scroll-bar-menu (make-sparse-keymap "Scroll-bar"))
 
 (define-key menu-bar-showhide-scroll-bar-menu [right]
@@ -874,8 +883,6 @@ Do the same for the keys of the same name."
               :help "Invoke the Emacs built-in scientific calculator"))
 (define-key menu-bar-tools-menu [calendar]
   '(menu-item "Display Calendar" calendar))
-(define-key menu-bar-tools-menu [speedbar]
-  '(menu-item "Display Speedbar" speedbar-frame-mode))
 
 (define-key menu-bar-tools-menu [separator-net]
   '("--"))
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index 292df46976d..44e5f9a92aa 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -51,6 +51,7 @@
   "Spell checking on the fly."
   :tag "FlySpell"
   :prefix "flyspell-"
+  :group 'ispell
   :group 'processes)
 
 ;*---------------------------------------------------------------------*/
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 180bedc6481..041a4935111 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1,6 +1,6 @@
 ;;; ispell.el --- interface to International Ispell Versions 3.1 and 3.2
 
-;; Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 ;; Author:           Ken Stevens <k.stevens@ieee.org>
 ;; Maintainer:       Ken Stevens <k.stevens@ieee.org>
@@ -878,11 +878,20 @@ and added as a submenu of the \"Edit\" menu.")
         '(menu-item "Save Dictionary"
                     (lambda () (interactive) (ispell-pdict-save t t))
                     :help "Save personal dictionary"))
+      (define-key ispell-menu-map [ispell-customize]
+        '(menu-item "Customize..."
+                    (lambda () (interactive) (customize-group 'ispell))
+                    :help "Customize spell checking options"))
       (define-key ispell-menu-map [ispell-help]
         ;; use (x-popup-menu last-nonmenu-event(list "" ispell-help-list)) ?
         '(menu-item "Help"
                     (lambda () (interactive) (describe-function 'ispell-help))
                     :help "Show standard Ispell keybindings and commands"))
+      (define-key ispell-menu-map [flyspell-mode]
+        '(menu-item "Automatic spell checking (Flyspell)"
+                    flyspell-mode
+                    :help "Check spelling while you edit the text"
+                    :button (:toggle . flyspell-mode)))
       (define-key ispell-menu-map [ispell-complete-word]
         '(menu-item "Complete Word" ispell-complete-word
                     :help "Complete word at cursor using dictionary"))