Merge from emacs-24; up to 2014-07-21T01:34:03Z!monnier@iro.umontreal.ca

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

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 7fbddbe1c45051d1bb494e8fc84f40603eeb2c97..b446a00bb8f2967e06b5a542f4cc25e206a1f6bc 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -198,6 +198,8 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
 
             ;; editfns.c
             (user-full-name mail string)
+            ;; emacs.c
+            (report-emacs-bug-address emacsbug string)
             ;; eval.c
             (max-specpdl-size limits integer)
             (max-lisp-eval-depth limits integer)
@@ -364,7 +366,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                             left)
                      (const control) (const meta)
                      (const alt) (const hyper)
-                     (const super)) "24.0")
+                     (const super)) "24.1")
             (ns-command-modifier
              ns
              (choice (const :tag "No modifier" nil)
@@ -378,7 +380,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                             left)
                      (const control) (const meta)
                      (const alt) (const hyper)
-                     (const super)) "24.0")
+                     (const super)) "24.1")
             (ns-alternate-modifier
              ns
              (choice (const :tag "No modifier (work as alternate/option)" none)
@@ -400,7 +402,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                      (const alt) (const hyper)
                      (const super)) "23.1")
             (ns-antialias-text ns boolean "23.1")
-            (ns-auto-hide-menu-bar ns boolean "24.0")
+            (ns-auto-hide-menu-bar ns boolean "24.1")
             (ns-use-native-fullscreen ns boolean "24.4")
             (ns-use-srgb-colorspace ns boolean "24.4")
             ;; process.c