(sml-mode-menu): Remove left over obsolete entries.

diff --git a/ChangeLog b/ChangeLog
index f785c9c2351901b9c29b592532ab6167471d7580..f2facd4ce5b750742578d6ca1679c214abb6e389 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * sml-defs.el (sml-mode-menu): Remove left over obsolete entries.
+
+       * sml-proc.el (inferior-sml-mode): Preserve the menu-bar of the
+       compilation minor mode, if any.
+
 2004-11-24  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * Release version 4.0.

diff --git a/sml-defs.el b/sml-defs.el
index 4cdc6fa5fc1c91b43065a9132b887ab2c1f55add..b685b4133d46bb1c9a3a5b6dc47838a021cec390 100644 (file)
--- a/sml-defs.el
+++ b/sml-defs.el
@@ -1,6 +1,6 @@
 ;;; sml-defs.el --- Various definitions for sml-mode
 
-;; Copyright (C) 1999,2000,2003  Stefan Monnier <monnier@cs.yale.edu>
+;; Copyright (C) 1999,2000,2003,2005  Stefan Monnier <monnier@cs.yale.edu>
 ;;
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -98,14 +98,14 @@ notion of \"the end of an outline\".")
     ("Format/Mode Variables"
      ["indent region"             indent-region t]
      ["outdent"                   sml-back-to-outer-indent t]
-     ["-" nil nil]
-     ["set indent-level"          sml-indent-level t]
-     ["set pipe-indent"           sml-pipe-indent t]
-     ["--" nil nil]
-     ["toggle type-of-indent"     (sml-type-of-indent) t]
-     ["toggle nested-if-indent"   (sml-nested-if-indent) t]
-     ["toggle case-indent"        (sml-case-indent) t]
-     ["toggle electric-semi-mode" (sml-electric-semi-mode) t])
+     ;; ["-" nil nil]
+     ;; ["set indent-level"          sml-indent-level t]
+     ;; ["set pipe-indent"           sml-pipe-indent t]
+     ;; ["--" nil nil]
+     ;; ["toggle type-of-indent"     sml-type-of-indent t]
+     ;; ["toggle nested-if-indent"   sml-nested-if-indent t]
+     ;; ["toggle electric-semi-mode" sml-electric-semi-mode t]
+     )
     ["-----" nil nil]
     ["SML mode help (brief)"       describe-mode t]
     ["SML mode *info*"             sml-mode-info t]