* simple.el (bad-package-check): Fix arguments of `display-warning',

  using the package name as TYPE.  Use `string-match-p'.

2 files changed, 8 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9ff2ec275ea..e1ec5a1fa97 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,14 @@
+2008-12-15  Juanma Barranquero  <lekktu@gmail.com>
+
+        * simple.el (bad-package-check): Fix arguments of `display-warning',
+        using the package name as TYPE.  Use `string-match-p'.
+
 2008-12-14  Roland Winkler  <Roland.Winkler@physik.uni-erlangen.de>
 
         * proced.el (proced-sort-interactive, proced-sort-pcpu)
         (proced-sort-pmem, proced-sort-start, proced-sort-time)
         (proced-sort-user, proced-sort-header): Prefix arg determines
-        sorting order. Suggested by Dan Nicolaescu.
+        sorting order.  Suggested by Dan Nicolaescu.
         (proced-revert): Doc fix.
 
 2008-12-14  Roland Winkler  <Roland.Winkler@physik.uni-erlangen.de>
@@ -911,7 +916,6 @@
         * progmodes/tcl.el (tcl-filter): Don't forcibly move point.
 
 2008-11-21  Stefan Monnier  <monnier@iro.umontreal.ca>
-
         * international/quail.el (quail-indent-to): New function.
         (quail-completion-1, quail-completion-list-translations)
         (quail-insert-decode-map): Use it to improve alignment.
@@ -3094,7 +3098,6 @@
 2008-09-12  Glenn Morris  <rgm@gnu.org>
 
         * progmodes/f90.el (f90-mode-map): Don't bind \t and \r.
-
         * indent.el (indent-line-function): Doc fix.
         * progmodes/sh-script.el (sh-font-lock-open-heredoc): Doc fix.
 
@@ -11812,7 +11815,6 @@
 
         * find-dired.el (find-dired-filter): Fix last patch to handle
         multi-line process input.  Pad link numbers too.
-
 2008-04-01  Jari Aalto  <jari.aalto@cante.net>
 
         * find-dired.el (find-dired-filter): Align columns by padding file sizes.
diff --git a/lisp/simple.el b/lisp/simple.el
index 1811315b21f..357de51a3db 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -6335,8 +6335,8 @@ warning using STRING as the message.")
              (boundp symbol)
              (or (eq symbol t)
                  (and (stringp (setq symbol (eval symbol)))
-                      (string-match (nth 2 list) symbol)))
-             (display-warning :warning (nth 3 list))))
+                      (string-match-p (nth 2 list) symbol)))
+             (display-warning package (nth 3 list) :warning)))
     (error nil)))
 
 (mapc (lambda (elem)