From: Julien Danjou <julien@danjou.info>
Date: Wed, 1 Dec 2010 19:16:28 +0000 (+0100)
Subject: Remove deprecated gnus-local-organization.
X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=0c6af30d0f40cafbd52426d85bd62be9477494a3

Remove deprecated gnus-local-organization.

Signed-off-by: Julien Danjou <julien@danjou.info>
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cfa37279f..77823083b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2010-12-01  Julien Danjou  <julien@danjou.info>
 
+	* message.el (message-user-organization): Do not use gnus-local-organization.
+
+	* gnus.el: Remove gnus-local-organization.
+
 	* gnus-msg.el: Remove nastygram thing.
 
 2010-12-01  Teodor Zlatanov  <tzz@lifelogs.com>
diff --git a/lisp/gnus.el b/lisp/gnus.el
index 1bb59c206..fd187756b 100644
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -1400,10 +1400,6 @@ no need to set this variable."
 		 string))
 (make-obsolete-variable 'gnus-local-domain nil "Emacs 24.1")
 
-(defvar gnus-local-organization nil
-  "String with a description of what organization (if any) the user belongs to.
-Obsolete variable; use `message-user-organization' instead.")
-
 ;; Customization variables
 
 (defcustom gnus-refer-article-method 'current
diff --git a/lisp/message.el b/lisp/message.el
index 8af17c0c4..5b10f5d6a 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -515,14 +515,9 @@ This is used by `message-kill-buffer'."
   :group 'message-buffers
   :type 'boolean)
 
-(defvar gnus-local-organization)
 (defcustom message-user-organization
-  (or (and (boundp 'gnus-local-organization)
-	   (stringp gnus-local-organization)
-	   gnus-local-organization)
-      (getenv "ORGANIZATION")
-      t)
-  "*String to be used as an Organization header.
+  (or (getenv "ORGANIZATION") t)
+  "String to be used as an Organization header.
 If t, use `message-user-organization-file'."
   :group 'message-headers
   :type '(choice string