aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2007-11-16 01:28:02 +0000
committerJuri Linkov2007-11-16 01:28:02 +0000
commitbab6f293f73560ee6147bd474dd1997d982e9292 (patch)
treeaebbc0e65ce096a0e046d84dcb7590bdcef2ce58
parent6af41c87dfc91b3cc980467b074e5efed3998ed5 (diff)
downloademacs-bab6f293f73560ee6147bd474dd1997d982e9292.tar.gz
emacs-bab6f293f73560ee6147bd474dd1997d982e9292.zip
(Man-heading-regexp): Add 0-9.
(Man-first-heading-regexp): Remove leading space [ \t]* before NAME.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/man.el7
2 files changed, 10 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a45abc3e3ac..7ca055fb9cf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12007-11-16 Juri Linkov <juri@jurta.org>
2
3 * man.el (Man-heading-regexp): Add 0-9.
4 (Man-first-heading-regexp): Remove leading space [ \t]* before NAME.
5
12007-11-15 Juanma Barranquero <lekktu@gmail.com> 62007-11-15 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * progmodes/cc-engine.el (c-crosses-statement-barrier-p): 8 * progmodes/cc-engine.el (c-crosses-statement-barrier-p):
diff --git a/lisp/man.el b/lisp/man.el
index fc84f327271..4056ddedb29 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -264,14 +264,17 @@ the associated section number."
264 "(\\(" Man-section-regexp "\\))\\).*\\1")) 264 "(\\(" Man-section-regexp "\\))\\).*\\1"))
265 "Regular expression describing the heading of a page.") 265 "Regular expression describing the heading of a page.")
266 266
267(defvar Man-heading-regexp "^\\([A-Z][A-Z /-]+\\)$" 267(defvar Man-heading-regexp "^\\([A-Z][A-Z0-9 /-]+\\)$"
268 "Regular expression describing a manpage heading entry.") 268 "Regular expression describing a manpage heading entry.")
269 269
270(defvar Man-see-also-regexp "SEE ALSO" 270(defvar Man-see-also-regexp "SEE ALSO"
271 "Regular expression for SEE ALSO heading (or your equivalent). 271 "Regular expression for SEE ALSO heading (or your equivalent).
272This regexp should not start with a `^' character.") 272This regexp should not start with a `^' character.")
273 273
274(defvar Man-first-heading-regexp "^[ \t]*NAME$\\|^[ \t]*No manual entry fo.*$" 274;; This used to have leading space [ \t]*, but was removed because it
275;; causes false page splits on an occasional NAME with leading space
276;; inside a manpage. And `Man-heading-regexp' doesn't have [ \t]* anyway.
277(defvar Man-first-heading-regexp "^NAME$\\|^[ \t]*No manual entry fo.*$"
275 "Regular expression describing first heading on a manpage. 278 "Regular expression describing first heading on a manpage.
276This regular expression should start with a `^' character.") 279This regular expression should start with a `^' character.")
277 280