# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1254195423 0
# Node ID 7f2b90c428b4a978ec08a2d0b9cddf9a85b10b4f
# Parent  0c6bc9d2b10c27cf0e891713ce013a3fdbc79b17
(check-declare-locate): Remove pointless file-name-nondirectory call
preventing location of cedet files.
(check-declare-verify): Use literal search rather than re-search.

diff -r 0c6bc9d2b10c -r 7f2b90c428b4 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Sep 29 02:43:46 2009 +0000
+++ b/lisp/ChangeLog	Tue Sep 29 03:37:03 2009 +0000
@@ -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 -r 0c6bc9d2b10c -r 7f2b90c428b4 lisp/emacs-lisp/check-declare.el
--- a/lisp/emacs-lisp/check-declare.el	Tue Sep 29 02:43:46 2009 +0000
+++ b/lisp/emacs-lisp/check-declare.el	Tue Sep 29 03:37:03 2009 +0000
@@ -54,7 +54,7 @@
     (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 @@
                   ;; 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]*\