mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-19 04:10:18 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
(rst-mode): Set it.

Fixes: debbugs:17131
This commit is contained in:
Stefan Monnier 2014-04-28 11:04:49 -04:00
parent 8e554df009
commit 4f5fa75591
3 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
doc/lispref/ChangeLog
View file

@ -10,6 +10,11 @@
* internals.texi (Building Emacs): Improve indexing. * 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> 2014-04-05 Glenn Morris <rgm@gnu.org>
* os.texi (Recording Input): Dribble files may contain passwords. * os.texi (Recording Input): Dribble files may contain passwords.

5
lisp/ChangeLog
View file

@ -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> 2014-04-27 Juri Linkov <juri@jurta.org>
* desktop.el (desktop-value-to-string): Let-bind `print-length' * desktop.el (desktop-value-to-string): Let-bind `print-length'

7
lisp/textmodes/rst.el
View file

@ -784,11 +784,9 @@ This inherits from Text mode.")
(modify-syntax-entry ?\u2019 "." st) (modify-syntax-entry ?\u2019 "." st)
(modify-syntax-entry ?\u201c "." st) (modify-syntax-entry ?\u201c "." st)
(modify-syntax-entry ?\u201d "." st) (modify-syntax-entry ?\u201d "." st)
st) st)
"Syntax table used while in `rst-mode'.") "Syntax table used while in `rst-mode'.")
(defcustom rst-mode-hook nil (defcustom rst-mode-hook nil
"Hook run when `rst-mode' is turned on. "Hook run when `rst-mode' is turned on.
The hook for `text-mode' is run before this one." 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. ;; Pull in variable definitions silencing byte-compiler.
(require 'newcomment) (require 'newcomment)
(defvar electric-pair-pairs)
;; Use rst-mode for *.rst and *.rest files. Many ReStructured-Text files ;; 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. ;; 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))) ;;;###autoload (add-to-list 'auto-mode-alist (purecopy '("\\.re?st\\'" . rst-mode)))
@ -860,6 +860,9 @@ highlighting.
(set (make-local-variable 'uncomment-region-function) (set (make-local-variable 'uncomment-region-function)
'rst-uncomment-region) 'rst-uncomment-region)
(set (make-local-variable 'electric-pair-pairs)
'((?\" . ?\") (?\* . ?\*) (?\` . ?\`)))
;; Imenu and which function. ;; Imenu and which function.
;; FIXME: Check documentation of `which-function' for alternative ways to ;; FIXME: Check documentation of `which-function' for alternative ways to
;; determine the current function name. ;; determine the current function name.