Merge from origin/emacs-24

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

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 5394a1c3744167d772f4de0501b3b7aa5042e62e..71506cb680ea45a986c66f8b3a2b7d8e1f2cc830 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -1,6 +1,6 @@
 ;;; cus-start.el --- define customization properties of builtins
 
-;; Copyright (C) 1997, 1999-2014 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999-2015 Free Software Foundation, Inc.
 
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: internal
@@ -421,6 +421,12 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                                                    "21.1")
              ;; term.c
              (visible-cursor cursor boolean "22.1")
+             ;; terminal.c
+             (ring-bell-function display
+              (choice
+               (const :tag "Default" nil)
+               (const :tag "Silent" ignore)
+               function))
             ;; undo.c
             (undo-limit undo integer)
             (undo-strong-limit undo integer)