2 files changed, 15 insertions, 12 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e0cc3f3b595..1510c6a8fba 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * cus-start.el (all): Remove inhibit-local-menu-bar-menus.
+
 2013-02-11  Glenn Morris  <rgm@gnu.org>
 
         * vc/diff.el (diff-use-labels): New variable.
@@ -14,8 +18,8 @@
 
 2013-02-10  Christopher Schmidt  <christopher@ch.ristopher.com>
 
-        * minibuf-eldef.el (minibuffer-default--in-prompt-regexps): Handle
-        "foo (bar, default: xxx): " prompts.
+        * minibuf-eldef.el (minibuffer-default--in-prompt-regexps):
+        Handle "foo (bar, default: xxx): " prompts.
 
 2013-02-10  Chong Yidong  <cyd@gnu.org>
 
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 2bc47426332..2e442b6c944 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -286,7 +286,6 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
              (double-click-time mouse (restricted-sexp
                                        :match-alternatives (integerp 'nil 't)))
              (double-click-fuzz mouse integer "22.1")
-             (inhibit-local-menu-bar-menus menu boolean)
              (help-char keyboard character)
              (help-event-list keyboard (repeat (sexp :format "%v")))
              (menu-prompting menu boolean)
@@ -301,15 +300,15 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                                      (const :tag "When sent SIGUSR2" sigusr2))
                              "24.1")
 
-;; This is not good news because it will use the wrong
-;; version-specific directories when you upgrade.  We need
-;; customization of the front of the list, maintaining the standard
-;; value intact at the back.
-;;;          (load-path environment
-;;;                     (repeat (choice :tag "[Current dir?]"
-;;;                                     :format "%[Current dir?%] %v"
-;;;                                     (const :tag " current dir" nil)
-;;;                                     (directory :format "%v"))))
+             ;; This is not good news because it will use the wrong
+             ;; version-specific directories when you upgrade.  We need
+             ;; customization of the front of the list, maintaining the
+             ;; standard value intact at the back.
+             ;;(load-path environment
+             ;;         (repeat (choice :tag "[Current dir?]"
+             ;;                         :format "%[Current dir?%] %v"
+             ;;                         (const :tag " current dir" nil)
+             ;;                         (directory :format "%v"))))
              ;; minibuf.c
              (enable-recursive-minibuffers minibuffer boolean)
              (history-length minibuffer