* message.el (message-user-organization-file): Check several

locations of the organization file.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7d74f82..bf92d4f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2006-04-26  Reiner Steib  <Reiner.Steib@gmx.de>
 
+       * message.el (message-user-organization-file): Check several
+       locations of the organization file.
+
        * gnus-sum.el (gnus-summary-mime-map, gnus-summary-make-menu-bar):
        Add gnus-article-view-part-as-type.
 

diff --git a/lisp/message.el b/lisp/message.el
index f648f2b..a238a7b 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -471,7 +471,14 @@ If t, use `message-user-organization-file'."
                 (const :tag "consult file" t)))
 
 ;;;###autoload
-(defcustom message-user-organization-file "/usr/lib/news/organization"
+(defcustom message-user-organization-file
+  (let (orgfile)
+    (dolist (f (list "/etc/organization"
+                    "/etc/news/organization"
+                    "/usr/lib/news/organization"))
+      (when (file-readable-p f)
+       (setq orgfile f)))
+    orgfile)
   "*Local news organization file."
   :type 'file
   :link '(custom-manual "(message)News Headers")