diff options
| author | Glenn Morris | 2012-12-09 18:00:42 -0800 |
|---|---|---|
| committer | Glenn Morris | 2012-12-09 18:00:42 -0800 |
| commit | 265c2fbf11cb8bf9b805df63ecb9508631f08e35 (patch) | |
| tree | 808684294d7ec600f5300e0a5d5f868740096f7b /lisp/textmodes | |
| parent | 5f460827dd14fbfae26ac8451cedd4446817d1ec (diff) | |
| parent | f433306af510e86a614e9f9f082b6d2d5f56a968 (diff) | |
| download | emacs-265c2fbf11cb8bf9b805df63ecb9508631f08e35.tar.gz emacs-265c2fbf11cb8bf9b805df63ecb9508631f08e35.zip | |
Merge from emacs-24; up to 2012-11-26T19:56:14Z!monnier@iro.umontreal.ca
Diffstat (limited to 'lisp/textmodes')
| -rw-r--r-- | lisp/textmodes/texinfo.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el index 253b56f09b1..263d875a5f0 100644 --- a/lisp/textmodes/texinfo.el +++ b/lisp/textmodes/texinfo.el | |||
| @@ -678,7 +678,8 @@ Puts point on a blank line between them." | |||
| 678 | (not (match-end 1))))) | 678 | (not (match-end 1))))) |
| 679 | 679 | ||
| 680 | (defvar texinfo-enable-quote-macros "@\\(code\\|samp\\|kbd\\)\\>") | 680 | (defvar texinfo-enable-quote-macros "@\\(code\\|samp\\|kbd\\)\\>") |
| 681 | (defvar texinfo-enable-quote-envs '("example\\>" "lisp\\>")) | 681 | (defvar texinfo-enable-quote-envs |
| 682 | '("example\\>" "smallexample\\>" "lisp\\>")) | ||
| 682 | (defun texinfo-insert-quote (&optional arg) | 683 | (defun texinfo-insert-quote (&optional arg) |
| 683 | "Insert the appropriate quote mark for Texinfo. | 684 | "Insert the appropriate quote mark for Texinfo. |
| 684 | Usually inserts the value of `texinfo-open-quote' (normally ``) or | 685 | Usually inserts the value of `texinfo-open-quote' (normally ``) or |