(Man-highlight-references): Set an empty

string to `Man-arguments' if it is nil.
Suggested by Reiner Steib <reinersteib+gmane@imap.cc>.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9fa5965093c7006b14eff8467ee44320680f039b..685c56bd6ba4c83e2aa2c4004583f4184646736e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-10  Masatake YAMATO  <jet@gyve.org>
+
+       * man.el (Man-highlight-references): Set an empty
+       string to `Man-arguments' if it is nil.
+       Suggested by Reiner Steib <reinersteib+gmane@imap.cc>.
+
 2005-11-09  Richard M. Stallman  <rms@gnu.org>
 
        * apropos.el (apropos-pattern): Renamed from apropos-regexp.

diff --git a/lisp/man.el b/lisp/man.el
index 30ab44efad0a40b1227c5c78fbef3cd47c7e959a..5b5096f157da2d53c3d84a9a0f01e2ca9714d422 100644 (file)
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -923,6 +923,10 @@ header file (#include <foo.h>) and files in FILES.
 If XREF-MAN-TYPE is used as the button type for items
 in SEE ALSO section. If it is nil, default type, 
 `Man-xref-man-page' is used."
+  ;; `Man-highlight-references' is used from woman.el, too.
+  ;; woman.el doesn't set `Man-arguments'.
+  (unless Man-arguments
+    (setq Man-arguments ""))
   (if (string-match "-k " Man-arguments)
       (progn
        (Man-highlight-references0