(diff-mode-shared-map): Don't bind M-W, M-U, M-C,

[gnu-emacs] / lisp / cus-start.el

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 3b9d7c34e5ee34944ff00d32a3d7b0d56105c57d..355cf7bb9abee265dc9cbbc47975eca72381f51c 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -52,7 +52,7 @@
             (ctl-arrow display boolean)
             (truncate-lines display boolean)
             (selective-display-ellipses display boolean)
-            (indicate-empty-lines fringe boolean "21.1")
+            (indicate-empty-lines fringe boolean)
             (indicate-buffer-boundaries
              fringe
              (choice
@@ -91,8 +91,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                            (const :tag "Do not show" (down . nil))
                            (const :tag "On the left" (down . left))
                            (const :tag "On the right" (down . right))))
-              (other :tag "On left, no arrows" t))
-             "22.1")
+              (other :tag "On left, no arrows" t)))
             (scroll-up-aggressively windows
                                     (choice (const :tag "off" nil) number)
                                     "21.1")
@@ -174,7 +173,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                                            (const :tag "always shown" t)
                                            (other :tag "hidden by keypress" 1)))
             ;; fringe.c
-            (overflow-newline-into-fringe fringe boolean "22.1")
+            (overflow-newline-into-fringe fringe boolean)
             ;; indent.c
             (indent-tabs-mode fill boolean)
             ;; keyboard.c
@@ -359,6 +358,7 @@ since it could result in memory overflow and make Emacs crash."
                                 (repeat (directory :format "%v")))
             (x-use-old-gtk-file-dialog menu boolean "22.1")
             (x-gtk-show-hidden-files menu boolean "22.1")
+            (x-gtk-whole-detached-tool-bar x boolean "22.1")
             ;; xterm.c
              (mouse-autoselect-window display boolean "21.3")
             (x-use-underline-position-properties display boolean "21.3")