* lisp/textmodes/rst.el (electric-pair-pairs): Declare.

(rst-mode): Set it.

Fixes: debbugs:17131

3 files changed, 15 insertions, 2 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index c2907cccf6e..f538b960b50 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -10,6 +10,11 @@
 
         * internals.texi (Building Emacs): Improve indexing.
 
+2014-04-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * display.texi (Overlay Properties): Reword the doc of `priority'.
+        (Finding Overlays): Document new arg of `overlays-at'.
+
 2014-04-05  Glenn Morris  <rgm@gnu.org>
 
         * os.texi (Recording Input): Dribble files may contain passwords.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 94a80120ed8..e27d7b1c6a0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * textmodes/rst.el (electric-pair-pairs): Declare.
+        (rst-mode): Set it (bug#17131).
+
 2014-04-27  Juri Linkov  <juri@jurta.org>
 
         * desktop.el (desktop-value-to-string): Let-bind `print-length'
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index d4a3438ce97..b05a5e5a7e3 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -784,11 +784,9 @@ This inherits from Text mode.")
     (modify-syntax-entry ?\u2019 "." st)
     (modify-syntax-entry ?\u201c "." st)
     (modify-syntax-entry ?\u201d "." st)
-
     st)
   "Syntax table used while in `rst-mode'.")
 
-
 (defcustom rst-mode-hook nil
   "Hook run when `rst-mode' is turned on.
 The hook for `text-mode' is run before this one."
@@ -799,6 +797,8 @@ The hook for `text-mode' is run before this one."
 ;; Pull in variable definitions silencing byte-compiler.
 (require 'newcomment)
 
+(defvar electric-pair-pairs)
+
 ;; Use rst-mode for *.rst and *.rest files.  Many ReStructured-Text files
 ;; use *.txt, but this is too generic to be set as a default.
 ;;;###autoload (add-to-list 'auto-mode-alist (purecopy '("\\.re?st\\'" . rst-mode)))
@@ -860,6 +860,9 @@ highlighting.
   (set (make-local-variable 'uncomment-region-function)
        'rst-uncomment-region)
 
+  (set (make-local-variable 'electric-pair-pairs)
+       '((?\" . ?\") (?\* . ?\*) (?\` . ?\`)))
+
   ;; Imenu and which function.
   ;; FIXME: Check documentation of `which-function' for alternative ways to
   ;;        determine the current function name.