Mercurial > emacs
diff lisp/woman.el @ 90737:95d0cdf160ea
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 586-614)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- Merge from erc--main--0
- Make byte compiler correctly write circular constants
* gnus--rel--5.10 (patch 186-196)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 26 Jan 2007 06:16:11 +0000 |
| parents | bc10a33dd40b e3694f1cb928 |
| children | 91bf6e05918b |
line wrap: on
line diff
--- a/lisp/woman.el Fri Jan 26 02:30:28 2007 +0000 +++ b/lisp/woman.el Fri Jan 26 06:16:11 2007 +0000 @@ -1,7 +1,7 @@ ;;; woman.el --- browse UN*X manual pages `wo (without) man' ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, -;; 2006 Free Software Foundation, Inc. +;; 2006, 2007 Free Software Foundation, Inc. ;; Author: Francis J. Wright <F.J.Wright@qmul.ac.uk> ;; Maintainer: FSF @@ -2112,7 +2112,7 @@ (progn (goto-char (point-min)) (not (re-search-forward "^\\.\\([pnil]p\\|sh\\)[ \n]" (point-max) t)))) - (error "WoMan can only format manpages written in the an format"))) + (error "WoMan can only format man pages written with the usual `-man' macros"))) (and (boundp 'font-lock-mode) font-lock-mode (font-lock-mode -1)) ;; (fundamental-mode)