diff options
| author | Adrian Robert <Adrian.B.Robert@gmail.com> | 2008-07-15 18:15:18 +0000 |
|---|---|---|
| committer | Adrian Robert <Adrian.B.Robert@gmail.com> | 2008-07-15 18:15:18 +0000 |
| commit | edfda78355c5528eee489fa8a7f9c73bf8e734f2 (patch) | |
| tree | 78d2414d9791e1efc17ec9b35b438ae35602340a /lisp/woman.el | |
| parent | 1391cd548782097e34d7856ec4f20ca90bdf2c26 (diff) | |
| download | emacs-edfda78355c5528eee489fa8a7f9c73bf8e734f2.tar.gz | |
merging Emacs.app (NeXTstep port)
Diffstat (limited to 'lisp/woman.el')
| -rw-r--r-- | lisp/woman.el | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/woman.el b/lisp/woman.el index 685304e979c..99de62e3a3f 100644 --- a/lisp/woman.el +++ b/lisp/woman.el @@ -545,9 +545,11 @@ Change only via `Customization' or the function `add-hook'." (defcustom woman-man.conf-path (let ((path '("/usr/lib" "/etc"))) - (if (eq system-type 'windows-nt) - (mapcar 'woman-Cyg-to-Win path) - path)) + (cond ((eq system-type 'windows-nt) + (mapcar 'woman-Cyg-to-Win path)) + ((eq system-type 'darwin) + (cons "/usr/share/misc" path)) + (t path))) "List of dirs to search and/or files to try for man config file. A trailing separator (`/' for UNIX etc.) on directories is optional, and the filename is used if a directory specified is @@ -860,7 +862,7 @@ Should begin with \\. and end with \\' and MUST NOT be optional." (defcustom woman-use-own-frame ; window-system (or (and (fboundp 'display-graphic-p) (display-graphic-p)) ; Emacs 21 - (memq window-system '(x w32))) ; Emacs 20 + (memq window-system '(x w32 ns))) ; Emacs 20 "If non-nil then use a dedicated frame for displaying WoMan windows. Only useful when run on a graphic display such as X or MS-Windows." :type 'boolean |