(find-coding-systems-for-charsets):

[bpt/emacs.git] / lisp / paren.el

diff --git a/lisp/paren.el b/lisp/paren.el
index 893407b..d3e3df0 100644 (file)
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -40,39 +40,6 @@
 ;; This is the overlay used to highlight the closeparen right before point.
 (defvar show-paren-overlay-1 nil)
 
-(defvar show-paren-idle-timer nil)
-
-(defvar show-paren-mode)  ;; Real definition comes later.
-
-;;;###autoload
-(defun show-paren-mode (&optional arg)
-  "Toggle Show Paren mode.
-With prefix ARG, turn Show Paren mode on if and only if ARG is positive.
-Returns the new status of Show Paren mode (non-nil means on).
-
-When Show Paren mode is enabled, any matching parenthesis is highlighted
-in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
-  (interactive "P")
-  (when window-system
-    (let ((on-p (if arg
-                   (> (prefix-numeric-value arg) 0)
-                 (not show-paren-mode))))
-      (setq blink-matching-paren-on-screen (not on-p))
-      (when show-paren-idle-timer
-       (cancel-timer show-paren-idle-timer))
-      (if on-p
-         (setq show-paren-idle-timer (run-with-idle-timer
-                                      show-paren-delay t
-                                      'show-paren-function))
-       (and show-paren-overlay (overlay-buffer show-paren-overlay)
-            (delete-overlay show-paren-overlay))
-       (and show-paren-overlay-1 (overlay-buffer show-paren-overlay-1)
-            (delete-overlay show-paren-overlay-1)))
-      (setq show-paren-mode on-p))))
-
-;; Naughty hack.  This variable was originally a `defvar' to keep track of
-;; whether Show Paren mode was turned on or not.  As a `defcustom' with
-;; special `:set' and `:require' forms, we can provide custom mode control.
 (defcustom show-paren-mode nil
   "Toggle Show Paren mode.
 When Show Paren mode is enabled, any matching parenthesis is highlighted
@@ -80,6 +47,7 @@ after `show-paren-delay' seconds of Emacs idle time.
 You must modify via \\[customize] for this variable to have an effect."
   :set (lambda (symbol value)
         (show-paren-mode (or value 0)))
+  :initialize 'custom-initialize-default
   :type 'boolean
   :group 'paren-showing
   :require 'paren)
@@ -99,10 +67,15 @@ otherwise)."
   :type '(number :tag "seconds")
   :group 'paren-showing)
 
+(defcustom show-paren-ring-bell-on-mismatch nil
+  "*If non-nil, beep if mismatched paren is detected."
+  :type 'boolean
+  :group 'paren-showing
+  :version "20.3")
+  
 (defface show-paren-match-face
   '((((class color)) (:background "turquoise"))
-    (((class grayscale)) (:background "gray"))
-    (t (:reverse-video t)))
+    (t (:background "gray")))
   "Show Paren mode face used for a matching paren."
   :group 'faces
   :group 'paren-showing)
@@ -114,6 +87,34 @@ otherwise)."
   :group 'faces
   :group 'paren-showing)
 
+(defvar show-paren-idle-timer nil)
+
+;;;###autoload
+(defun show-paren-mode (&optional arg)
+  "Toggle Show Paren mode.
+With prefix ARG, turn Show Paren mode on if and only if ARG is positive.
+Returns the new status of Show Paren mode (non-nil means on).
+
+When Show Paren mode is enabled, any matching parenthesis is highlighted
+in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
+  (interactive "P")
+  (when window-system
+    (let ((on-p (if arg
+                   (> (prefix-numeric-value arg) 0)
+                 (not show-paren-mode))))
+      (setq blink-matching-paren-on-screen (not on-p))
+      (when show-paren-idle-timer
+       (cancel-timer show-paren-idle-timer))
+      (if on-p
+         (setq show-paren-idle-timer (run-with-idle-timer
+                                      show-paren-delay t
+                                      'show-paren-function))
+       (and show-paren-overlay (overlay-buffer show-paren-overlay)
+            (delete-overlay show-paren-overlay))
+       (and show-paren-overlay-1 (overlay-buffer show-paren-overlay-1)
+            (delete-overlay show-paren-overlay-1)))
+      (setq show-paren-mode on-p))))
+
 ;; Find the place to show, if there is one,
 ;; and show it until input arrives.
 (defun show-paren-function ()
@@ -163,7 +164,10 @@ otherwise)."
        ;;
        ;; Use the correct face.
        (if mismatch
-           (setq face 'show-paren-mismatch-face)
+           (progn
+             (if show-paren-ring-bell-on-mismatch
+                 (beep))
+             (setq face 'show-paren-mismatch-face))
          (setq face 'show-paren-match-face))
        ;;
        ;; If matching backwards, highlight the closeparen
@@ -212,4 +216,7 @@ otherwise)."
 
 (provide 'paren)
 
+(if show-paren-mode
+    (show-paren-mode t))
+
 ;;; paren.el ends here