(check-declare-locate): Remove pointless file-name-nondirectory call

preventing location of cedet files.
(check-declare-verify): Use literal search rather than re-search.

2 files changed, 10 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index df4cec1f59e..b486ab5f6ae 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -12,6 +12,14 @@
 
 2009-09-29  Glenn Morris  <rgm@gnu.org>
 
+        * emacs-lisp/check-declare.el (check-declare-locate): Remove pointless
+        file-name-nondirectory call preventing location of cedet files.
+        (check-declare-verify): Use literal search rather than re-search.
+
+        * net/tramp-smb.el (tramp-smb-handle-directory-files-and-attributes):
+        Use tramp-compat-file-attributes rather than nonexistent
+        tramp-compat-handle-file-attributes.
+
         * Makefile.in (lisptagsfiles4): New.
         (AUTOGENEL): Add cedet loaddefs files.
         (TAGS, TAGS-LISP): Use $lisptagsfiles4.
diff --git a/lisp/emacs-lisp/check-declare.el b/lisp/emacs-lisp/check-declare.el
index 6b77dc1bdb4..1251699f8f1 100644
--- a/lisp/emacs-lisp/check-declare.el
+++ b/lisp/emacs-lisp/check-declare.el
@@ -54,7 +54,7 @@ the result."
     (setq file
           (if (member (file-name-extension file) '("c" "m"))
               (expand-file-name file (expand-file-name "src" source-directory))
-            (if (setq tfile (locate-library (file-name-nondirectory file)))
+            (if (setq tfile (locate-library file))
                 (progn
                   (setq tfile
                         (replace-regexp-in-string "\\.elc\\'" ".el" tfile))
@@ -158,7 +158,7 @@ ine-\\(?:derived\\|generic\\|\\(?:global\\(?:ized\\)?-\\)?minor\\)-mode\
                   ;; sig = 'err means we could not find an arglist.
                   sig (cond (cflag
                              (or
-                              (when (re-search-forward "," nil t 3)
+                              (when (search-forward "," nil t 3)
                                 (skip-chars-forward " \t\n")
                                 ;; Assuming minargs and maxargs on same line.
                                 (when (looking-at "\\([0-9]+\\)[ \t]*,[ \t]*\