HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(smtpmail-try-auth-methods): If the user has stored a user name, then
[bpt/emacs.git]
/
lisp
/
paren.el
diff --git
a/lisp/paren.el
b/lisp/paren.el
index
95f718d
..
8bd96b9
100644
(file)
--- a/
lisp/paren.el
+++ b/
lisp/paren.el
@@
-1,7
+1,6
@@
;;; paren.el --- highlight matching paren
;;; paren.el --- highlight matching paren
-;; Copyright (C) 1993, 1996, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1996, 2001-2011 Free Software Foundation, Inc.
;; Author: rms@gnu.org
;; Maintainer: FSF
;; Author: rms@gnu.org
;; Maintainer: FSF
@@
-9,10
+8,10
@@
;; This file is part of GNU Emacs.
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software
;
you can redistribute it and/or modify
+;; GNU Emacs is free software
:
you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation
; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation
, either version 3 of the License, or
+;;
(at your option)
any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-20,9
+19,7
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Commentary:
@@
-46,7
+43,7
@@
(defvar show-paren-overlay-1 nil)
(defcustom show-paren-style 'parenthesis
(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
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,20
+51,19
@@
otherwise)."
:type '(choice (const parenthesis) (const expression) (const mixed))
:group 'paren-showing)
:type '(choice (const parenthesis) (const expression) (const mixed))
:group 'paren-showing)
-(defcustom show-paren-delay
- (if (featurep 'lisp-float-type) (/ (float 1) (float 8)) 1)
- "*Time in seconds to delay before showing a matching paren."
+(defcustom show-paren-delay 0.125
+ "Time in seconds to delay before showing a matching paren."
:type '(number :tag "seconds")
:group 'paren-showing)
(defcustom show-paren-priority 1000
: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
: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")
:type 'boolean
:group 'paren-showing
:version "20.3")
@@
-89,16
+85,15
@@
otherwise)."
:background "gray"))
"Show Paren mode face used for a matching paren."
:group 'paren-showing-faces)
:background "gray"))
"Show Paren mode face used for a matching paren."
:group 'paren-showing-faces)
-;; backward-compatibility alias
-(put 'show-paren-match-face 'face-alias 'show-paren-match)
+(define-obsolete-face-alias 'show-paren-match-face 'show-paren-match "22.1")
(defface show-paren-mismatch
'((((class color)) (:foreground "white" :background "purple"))
(t (:inverse-video t)))
"Show Paren mode face used for a mismatching paren."
:group 'paren-showing-faces)
(defface show-paren-mismatch
'((((class color)) (:foreground "white" :background "purple"))
(t (:inverse-video t)))
"Show Paren mode face used for a mismatching paren."
:group 'paren-showing-faces)
-;; backward-compatibility alias
-
(put 'show-paren-mismatch-face 'face-alias 'show-paren-mismatch
)
+(define-obsolete-face-alias 'show-paren-mismatch-face
+
'show-paren-mismatch "22.1"
)
(defvar show-paren-highlight-openparen t
"*Non-nil turns on openparen highlighting when matching forward.")
(defvar show-paren-highlight-openparen t
"*Non-nil turns on openparen highlighting when matching forward.")
@@
-214,9
+209,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)
(delete-overlay show-paren-overlay-1))
(let ((from (if (= dir 1)
(point)
- (
forward-point -
1)))
+ (
- (point)
1)))
(to (if (= dir 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))
(point))))
(if show-paren-overlay-1
(move-overlay show-paren-overlay-1 from to (current-buffer))
@@
-240,7
+235,7
@@
in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
pos
(save-excursion
(goto-char pos)
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))))
(if show-paren-overlay
(move-overlay show-paren-overlay from to (current-buffer))
(setq show-paren-overlay (make-overlay from to nil t))))
@@
-256,5
+251,4
@@
in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time."
(provide 'paren)
(provide 'paren)
-;; arch-tag: d0969b88-7ac0-4bd0-bd53-e73b892b86a9
;;; paren.el ends here
;;; paren.el ends here