(Man-name-regexp): Also match Latin-1 soft hyphen.

(Man-build-references-alist): Handle Latin-1 soft hyphen.

2 files changed, 9 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4eeb925a4df..85c477489a9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-01  Andreas Schwab  <schwab@suse.de>
+
+        * man.el (Man-name-regexp): Also match Latin-1 soft hyphen.
+        (Man-build-references-alist): Handle Latin-1 soft hyphen.
+
 2003-05-31  Stephen Eglen  <stephen@gnu.org>
 
         * iswitchb.el (iswitchb-buffer-ignore): Update custom type to
diff --git a/lisp/man.el b/lisp/man.el
index 0c26ca4deb8..e7622f13200 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -1,6 +1,6 @@
-;;; man.el --- browse UNIX manual pages
+;;; man.el --- browse UNIX manual pages -*- coding: iso-8859-1 -*-
 
-;; Copyright (C) 1993, 1994, 1996, 1997, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1996, 1997, 2001, 2003 Free Software Foundation, Inc.
 
 ;; Author: Barry A. Warsaw <bwarsaw@cen.com>
 ;; Maintainer: FSF
@@ -241,7 +241,7 @@ the associated section number."
 (defvar Man-cooked-hook nil
   "Hook run after removing backspaces but before `Man-mode' processing.")
 
-(defvar Man-name-regexp "[-a-zA-Z0-9_][-a-zA-Z0-9_.]*"
+(defvar Man-name-regexp "[-a-zA-Z0-9_­][-a-zA-Z0-9_.­]*"
   "Regular expression describing the name of a manpage (without section).")
 
 (defvar Man-section-regexp "[0-9][a-zA-Z+]*\\|[LNln]"
@@ -999,7 +999,7 @@ The following key bindings are currently in effect in the buffer:
                               ;; Update len, in case a reference spans
                               ;; more than two lines (paranoia).
                               len (1- (length word))))
-                    (if (= (aref word len) ?-)
+                    (if (memq (aref word len) '(?- ?­))
                         (setq hyphenated (substring word 0 len)))
                     (if (string-match Man-reference-regexp word)
                         (aput 'Man-refpages-alist word))))