aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasatake YAMATO2005-11-10 04:49:19 +0000
committerMasatake YAMATO2005-11-10 04:49:19 +0000
commitaf8308ec80df3e1f05efec6cb030e8f37693fd2c (patch)
treef92682c4be9cd497ba9c3c8c3581ecdb3e16ced8
parentfe8bc3fa174dbfaf3420378f24120afa508b470a (diff)
downloademacs-af8308ec80df3e1f05efec6cb030e8f37693fd2c.tar.gz
emacs-af8308ec80df3e1f05efec6cb030e8f37693fd2c.zip
(Man-highlight-references): Set an empty
string to `Man-arguments' if it is nil. Suggested by Reiner Steib <reinersteib+gmane@imap.cc>.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/man.el4
2 files changed, 10 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9fa5965093c..685c56bd6ba 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12005-11-10 Masatake YAMATO <jet@gyve.org>
2
3 * man.el (Man-highlight-references): Set an empty
4 string to `Man-arguments' if it is nil.
5 Suggested by Reiner Steib <reinersteib+gmane@imap.cc>.
6
12005-11-09 Richard M. Stallman <rms@gnu.org> 72005-11-09 Richard M. Stallman <rms@gnu.org>
2 8
3 * apropos.el (apropos-pattern): Renamed from apropos-regexp. 9 * apropos.el (apropos-pattern): Renamed from apropos-regexp.
diff --git a/lisp/man.el b/lisp/man.el
index 30ab44efad0..5b5096f157d 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -923,6 +923,10 @@ header file (#include <foo.h>) and files in FILES.
923If XREF-MAN-TYPE is used as the button type for items 923If XREF-MAN-TYPE is used as the button type for items
924in SEE ALSO section. If it is nil, default type, 924in SEE ALSO section. If it is nil, default type,
925`Man-xref-man-page' is used." 925`Man-xref-man-page' is used."
926 ;; `Man-highlight-references' is used from woman.el, too.
927 ;; woman.el doesn't set `Man-arguments'.
928 (unless Man-arguments
929 (setq Man-arguments ""))
926 (if (string-match "-k " Man-arguments) 930 (if (string-match "-k " Man-arguments)
927 (progn 931 (progn
928 (Man-highlight-references0 932 (Man-highlight-references0