diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/electric.el | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1f033f175c5..61a674c836e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-04-04 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * electric.el (electric-pair-inhibit-predicate): Add :version. | ||
| 4 | |||
| 1 | 2013-04-04 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2013-04-04 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * emacs-lisp/package.el (package-compute-transaction): Fix ordering | 7 | * emacs-lisp/package.el (package-compute-transaction): Fix ordering |
diff --git a/lisp/electric.el b/lisp/electric.el index 7dab2da2b7d..86997d4aac7 100644 --- a/lisp/electric.el +++ b/lisp/electric.el | |||
| @@ -308,6 +308,7 @@ This can be convenient for people who find it easier to hit ) than C-f." | |||
| 308 | The function is called with a single char (the opening char just inserted). | 308 | The function is called with a single char (the opening char just inserted). |
| 309 | If it returns non-nil, then `electric-pair-mode' will not insert a matching | 309 | If it returns non-nil, then `electric-pair-mode' will not insert a matching |
| 310 | closer." | 310 | closer." |
| 311 | :version "24.4" | ||
| 311 | :type '(choice | 312 | :type '(choice |
| 312 | (const :tag "Default" electric-pair-default-inhibit) | 313 | (const :tag "Default" electric-pair-default-inhibit) |
| 313 | (const :tag "Always pair" ignore) | 314 | (const :tag "Always pair" ignore) |