aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2011-10-24 08:47:05 +0300
committerJuri Linkov2011-10-24 08:47:05 +0300
commitfeecf43567ca35641042bbec8e4d67ba64577360 (patch)
tree6f055dc744bbe4c27c86727a28d0d523e19a8e96
parenta3839de209ecd292b124b0818dbc60eaa654aa68 (diff)
downloademacs-feecf43567ca35641042bbec8e4d67ba64577360.tar.gz
emacs-feecf43567ca35641042bbec8e4d67ba64577360.zip
* lisp/info.el (Info-following-node-name-re): Add newline to the list
of allowed characters for leading space. Fixes: debbugs:9824
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/info.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index acefb4f6f15..264a4e8a7e8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-10-24 Juri Linkov <juri@jurta.org>
2
3 * info.el (Info-following-node-name-re): Add newline to the list
4 of allowed characters for leading space. (Bug#9824)
5
12011-10-24 Stefan Monnier <monnier@iro.umontreal.ca> 62011-10-24 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * progmodes/octave-inf.el (inferior-octave-mode-map): Fix C-c C-h binding. 8 * progmodes/octave-inf.el (inferior-octave-mode-map): Fix C-c C-h binding.
diff --git a/lisp/info.el b/lisp/info.el
index 4ccbeba2a47..b8deb3c9c7f 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -2015,7 +2015,7 @@ Submatch 1 is the complete node name.
2015Submatch 2 if non-nil is the parenthesized file name part of the node name. 2015Submatch 2 if non-nil is the parenthesized file name part of the node name.
2016Submatch 3 is the local part of the node name. 2016Submatch 3 is the local part of the node name.
2017End of submatch 0, 1, and 3 are the same, so you can safely concat." 2017End of submatch 0, 1, and 3 are the same, so you can safely concat."
2018 (concat "[ \t]*" ;Skip leading space. 2018 (concat "[ \t\n]*" ;Skip leading space.
2019 "\\(\\(([^)]+)\\)?" ;Node name can start with a file name. 2019 "\\(\\(([^)]+)\\)?" ;Node name can start with a file name.
2020 "\\([" (or allowedchars "^,\t\n") "]*" ;Any number of allowed chars. 2020 "\\([" (or allowedchars "^,\t\n") "]*" ;Any number of allowed chars.
2021 "[" (or allowedchars "^,\t\n") " ]" ;The last char can't be a space. 2021 "[" (or allowedchars "^,\t\n") " ]" ;The last char can't be a space.