woman-locale.

diff --git a/etc/NEWS b/etc/NEWS
index 54c680bb797c6b51a04a2aeae0173c5be4040c4f..c316b9cfb348518a21eb7ede7504c5b749358c85 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -432,6 +432,9 @@ saving changes.
 
 *** The pcmpl-unix package supports hostname completion for ssh and scp.
 
+*** WoMan tries to add locale-specific manual page directories to the
+search path.  This can be disabled by setting `woman-locale' to nil.
+
 \f
 * Changes in Emacs 23.1 on non-free operating systems
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5bb3f728bddd47a9f7ecbdb773257fe627df1991..e6247412fbebbde690224adfbdaf25b1c43ff482 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -21,6 +21,14 @@
 
 2008-02-08  Glenn Morris  <rgm@gnu.org>
 
+       * woman.el (woman-locale): New defcustom.
+       (woman-expand-locale, woman-manpath-add-locales): New functions.
+       (woman-manpath): Call woman-manpath-add-locales.  Bump :version.
+
+       * international/mule-cmds.el (locale-translate): New function,
+       with old code extracted from set-locale-environment.
+       (set-locale-environment): Use locale-translate.  Set woman-locale.
+
        * cus-start.el (selection-coding-system): Remove, since it's now
        defined in select.el rather than in xselect.c.
        * select.el (selection-coding-system): Make it a defcustom, and