Explicitly pass `obarray' to `unintern' to avoid a warning.

* gnus/gnus-registry.el (gnus-registry-install-shortcuts)
* obsolete/old-whitespace.el (whitespace-unload-function)

4 files changed, 12 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6f80ba5cdc5..b18c6c78172 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * obsolete/old-whitespace.el (whitespace-unload-function):
+        Explicitly pass `obarray' to `unintern' to avoid a warning.
+
 2010-09-14  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacs-lisp/byte-run.el (set-advertised-calling-convention):
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ced40cf3a32..7bb141ccfc0 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * gnus-registry.el (gnus-registry-install-shortcuts):
+        Explicitly pass `obarray' to `unintern' to avoid a warning.
+
 2010-09-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus-start.el (gnus-read-active-for-groups): Reverted the previous
diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index 5f945826941..8ba6c169bc4 100644
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -783,7 +783,7 @@ Uses `gnus-registry-marks' to find what shortcuts to install."
                   (function-name (format function-format variant-name))
                   (shortcut (format "%c" data))
                   (shortcut (if remove (upcase shortcut) shortcut)))
-             (unintern function-name)
+             (unintern function-name obarray)
              (eval
               `(defun
                  ;; function name
diff --git a/lisp/obsolete/old-whitespace.el b/lisp/obsolete/old-whitespace.el
index 4531bc06f81..0245537faaa 100644
--- a/lisp/obsolete/old-whitespace.el
+++ b/lisp/obsolete/old-whitespace.el
@@ -788,7 +788,7 @@ This is meant to be added buffer-locally to `write-file-functions'."
 
 (defun whitespace-unload-function ()
   "Unload the whitespace library."
-  (if (unintern "whitespace-unload-hook")
+  (if (unintern "whitespace-unload-hook" obarray)
       ;; if whitespace-unload-hook is defined, let's get rid of it
       ;; and recursively call `unload-feature'
       (progn (unload-feature 'whitespace) t)