diff options
author | Miles Bader <miles@gnu.org> | 2007-01-26 06:16:11 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2007-01-26 06:16:11 +0000 |
commit | c0466914ba3ad88c402b0301646b4b5db8aeb913 (patch) | |
tree | 964d8df324ab5f46872dfedc92ccea9fe50a1441 /lisp/woman.el | |
parent | c97a3f22ed5841f1c8bcdbb80df2bd49635c6a56 (diff) | |
parent | 58f8a3f97bd49484d0eb4f83a70662ded0daf9cc (diff) | |
download | emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.tar.gz |
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
Diffstat (limited to 'lisp/woman.el')
-rw-r--r-- | lisp/woman.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/woman.el b/lisp/woman.el index 2d3513f0097..728bf347d9f 100644 --- a/lisp/woman.el +++ b/lisp/woman.el @@ -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 @@ No external programs are used." (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) |