(completion-setup-function):

[gnu-emacs] / lisp / paren.el

diff --git a/lisp/paren.el b/lisp/paren.el
index c2f9775f7ceb27552791e7cf3a05c6636ef8ab66..9648471d3735e2a16a5711b7c58370cded59deac 100644 (file)
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -1,7 +1,7 @@
 ;;; paren.el --- highlight matching paren
 
 ;; Copyright (C) 1993, 1996, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
 ;; Author: rms@gnu.org
 ;; Maintainer: FSF
@@ -44,7 +44,7 @@
 (defvar show-paren-overlay-1 nil)
 
 (defcustom show-paren-style 'parenthesis
-  "*Style used when showing a matching paren.
+  "Style used when showing a matching paren.
 Valid styles are `parenthesis' (meaning show the matching paren),
 `expression' (meaning show the entire expression enclosed by the paren) and
 `mixed' (meaning show the matching paren if it is visible, and the expression
@@ -54,18 +54,18 @@ otherwise)."
 
 (defcustom show-paren-delay
   (if (featurep 'lisp-float-type) (/ (float 1) (float 8)) 1)
-  "*Time in seconds to delay before showing a matching paren."
+  "Time in seconds to delay before showing a matching paren."
   :type '(number :tag "seconds")
   :group 'paren-showing)
 
 (defcustom show-paren-priority 1000
-  "*Priority of paren highlighting overlays."
+  "Priority of paren highlighting overlays."
   :type 'integer
   :group 'paren-showing
   :version "21.1")
 
 (defcustom show-paren-ring-bell-on-mismatch nil
-  "*If non-nil, beep if mismatched paren is detected."
+  "If non-nil, beep if mismatched paren is detected."
   :type 'boolean
   :group 'paren-showing
   :version "20.3")
@@ -212,9 +212,9 @@ in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
                (delete-overlay show-paren-overlay-1))
            (let ((from (if (= dir 1)
                            (point)
-                         (forward-point -1)))
+                         (- (point) 1)))
                  (to (if (= dir 1)
-                         (forward-point 1)
+                         (+ (point) 1)
                        (point))))
              (if show-paren-overlay-1
                  (move-overlay show-paren-overlay-1 from to (current-buffer))
@@ -238,7 +238,7 @@ in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
                          pos
                        (save-excursion
                          (goto-char pos)
-                         (forward-point (- dir))))))
+                         (- (point) dir)))))
            (if show-paren-overlay
                (move-overlay show-paren-overlay from to (current-buffer))
              (setq show-paren-overlay (make-overlay from to nil t))))