diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-12-10 21:18:28 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-12-10 21:18:28 +0000 |
| commit | 16986fcfcca94e88e620c38775e15f758aa44935 (patch) | |
| tree | 1006528b714927481dc4ef9e649efa10eee17433 /lisp/emacs-lisp/edebug.el | |
| parent | 9ef706664e98e37e9633712126bae99869904677 (diff) | |
| parent | e67f8828f5f9c4ba3697e048c6386c5e9c0c801e (diff) | |
| download | emacs-16986fcfcca94e88e620c38775e15f758aa44935.tar.gz emacs-16986fcfcca94e88e620c38775e15f758aa44935.tar.bz2 emacs-16986fcfcca94e88e620c38775e15f758aa44935.zip | |
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-664
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-665
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-666
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-447
Diffstat (limited to 'lisp/emacs-lisp/edebug.el')
| -rw-r--r-- | lisp/emacs-lisp/edebug.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index 765548083b5..01f1d760109 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -733,8 +733,7 @@ already is one.)" ;; Leave point before the next token, skipping white space and comments. (skip-chars-forward " \t\r\n\f") (while (= (following-char) ?\;) - ;; \r is counted as a comment terminator to support selective display. - (skip-chars-forward "^\n\r") ; skip the comment + (skip-chars-forward "^\n") ; skip the comment (skip-chars-forward " \t\r\n\f"))) |