diff options
| author | Xue Fuqiao | 2013-12-24 16:33:02 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-12-24 16:33:02 +0800 |
| commit | 1139b0be8b1bc0d63420c69aaec0e2b0cb19d71d (patch) | |
| tree | 6aa1b9ec33f46afe6193c14f0d606dde5538d395 | |
| parent | 58f2b9a5583b998a94c40847fb8a7eba8474bcf6 (diff) | |
| download | emacs-1139b0be8b1bc0d63420c69aaec0e2b0cb19d71d.tar.gz emacs-1139b0be8b1bc0d63420c69aaec0e2b0cb19d71d.zip | |
* doc/emacs/trouble.texi (Checklist): Fix a cross-reference.
| -rw-r--r-- | doc/emacs/ChangeLog | 1 | ||||
| -rw-r--r-- | doc/emacs/trouble.texi | 6 | ||||
| -rw-r--r-- | lisp/emacs-lisp/rx.el | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 09a8f1c8f0b..00a6c6a29a1 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | 2013-12-24 Xue Fuqiao <xfq.free@gmail.com> | 1 | 2013-12-24 Xue Fuqiao <xfq.free@gmail.com> |
| 2 | 2 | ||
| 3 | * trouble.texi (Understanding Bug Reporting): Minor update. | 3 | * trouble.texi (Understanding Bug Reporting): Minor update. |
| 4 | (Checklist): Fix a cross-reference. | ||
| 4 | 5 | ||
| 5 | 2013-12-23 Xue Fuqiao <xfq.free@gmail.com> | 6 | 2013-12-23 Xue Fuqiao <xfq.free@gmail.com> |
| 6 | 7 | ||
diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi index 083f211bd23..52fd77ed978 100644 --- a/doc/emacs/trouble.texi +++ b/doc/emacs/trouble.texi | |||
| @@ -852,9 +852,9 @@ To make a backtrace for the error, use @kbd{M-x toggle-debug-on-error} | |||
| 852 | before the error happens (that is to say, you must give that command | 852 | before the error happens (that is to say, you must give that command |
| 853 | and then make the bug happen). This causes the error to start the Lisp | 853 | and then make the bug happen). This causes the error to start the Lisp |
| 854 | debugger, which shows you a backtrace. Copy the text of the | 854 | debugger, which shows you a backtrace. Copy the text of the |
| 855 | debugger's backtrace into the bug report. @xref{Debugger,, The Lisp | 855 | debugger's backtrace into the bug report. @xref{Edebug,, Edebug, |
| 856 | Debugger, elisp, the Emacs Lisp Reference Manual}, for information on | 856 | elisp, the Emacs Lisp Reference Manual}, for information on debugging |
| 857 | debugging Emacs Lisp programs with the Edebug package. | 857 | Emacs Lisp programs with the Edebug package. |
| 858 | 858 | ||
| 859 | This use of the debugger is possible only if you know how to make the | 859 | This use of the debugger is possible only if you know how to make the |
| 860 | bug happen again. If you can't make it happen again, at least copy | 860 | bug happen again. If you can't make it happen again, at least copy |
diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el index e578298106d..6d4c1070087 100644 --- a/lisp/emacs-lisp/rx.el +++ b/lisp/emacs-lisp/rx.el | |||
| @@ -871,7 +871,7 @@ NO-GROUP non-nil means don't put shy groups around the result." | |||
| 871 | REGEXPS is a non-empty sequence of forms of the sort listed below. | 871 | REGEXPS is a non-empty sequence of forms of the sort listed below. |
| 872 | 872 | ||
| 873 | Note that `rx' is a Lisp macro; when used in a Lisp program being | 873 | Note that `rx' is a Lisp macro; when used in a Lisp program being |
| 874 | compiled, the translation is performed by the compiler. | 874 | compiled, the translation is performed by the compiler. |
| 875 | See `rx-to-string' for how to do such a translation at run-time. | 875 | See `rx-to-string' for how to do such a translation at run-time. |
| 876 | 876 | ||
| 877 | The following are valid subforms of regular expressions in sexp | 877 | The following are valid subforms of regular expressions in sexp |