Move test/newsticker-testsuite.el to automated/newsticker-tests.el

2011-09-27  Ulf Jasper  <ulf.jasper@web.de>

	* automated/newsticker-tests.el: Move newsticker-testsuite.el
	to automated/newsticker-tests.el. Convert to ERT.

4 files changed, 29 insertions, 10 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 50dccb43b3b..bdf4522c4f5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2011-09-27  Eli Zaretskii  <eliz@gnu.org>
+
+	* minibuffer.el (completion-styles)
+	(completion-category-overrides): Cross reference each other in doc
+	strings.
+
+2011-09-27  Glenn Morris  <rgm@gnu.org>
+
+	* pcmpl-cvs.el (pcmpl-cvs-entries): Update for Emacs 22.1 changes
+	to split-string.  (Bug#9606)
+
+2011-09-27  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* mail/smtpmail.el (smtpmail-via-smtp): Fix STARTTLS detection
+	(bug#9615).
+
 2011-09-27  Chong Yidong  <cyd@stupidchicken.com>
 
 	* emacs-lisp/package.el (list-packages): Fix echo area message.
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 1c6f2c7b7ed..edcc82011af 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -658,7 +658,7 @@ The list is in preference order.")
 		   :always-query-capabilities t
 		   :starttls-function
 		   (lambda (capabilities)
-		     (and (string-match "-STARTTLS" capabilities)
+		     (and (string-match "[ -]STARTTLS" capabilities)
 			  "STARTTLS\r\n"))
 		   :client-certificate t
 		   :use-starttls-if-possible t)))
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index c6f28b14415..021e46d5053 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -482,7 +482,10 @@ and DOC describes the way this style of completion works.")
     ;; and simply add "bar" to the end of the result.
     emacs22)
   "List of completion styles to use.
-The available styles are listed in `completion-styles-alist'."
+The available styles are listed in `completion-styles-alist'.
+
+Note that `completion-category-overrides' may override these
+styles for specific categories, such as files, buffers, etc."
   :type `(repeat (choice ,@(mapcar (lambda (x) (list 'const (car x)))
                                    completion-styles-alist)))
   :group 'minibuffer
@@ -490,7 +493,7 @@ The available styles are listed in `completion-styles-alist'."
 
 (defcustom completion-category-overrides
   '((buffer (styles . (basic substring))))
-  "List of overrides for specific categories.
+  "List of `completion-styles' overrides for specific categories.
 Each override has the shape (CATEGORY . ALIST) where ALIST is
 an association list that can specify properties such as:
 - `styles': the list of `completion-styles' to use for that category.
diff --git a/lisp/pcmpl-cvs.el b/lisp/pcmpl-cvs.el
index b6c5eb62b17..3ff07bca20e 100644
--- a/lisp/pcmpl-cvs.el
+++ b/lisp/pcmpl-cvs.el
@@ -169,13 +169,13 @@ operation character applies, as displayed by 'cvs -n update'."
 	(insert-file-contents (concat dir "CVS/Entries"))
 	(goto-char (point-min))
 	(while (not (eobp))
-	  (let* ((line (buffer-substring (line-beginning-position)
-					 (line-end-position)))
-		 (fields (split-string line "/"))
-		 text)
-	    (if (eq (aref line 0) ?/)
-		(setq fields (cons "" fields)))
-	    (setq text (nth 1 fields))
+	  ;; Normal file: /NAME   -> "" "NAME"
+	  ;; Directory  : D/NAME  -> "D" "NAME"
+	  (let* ((fields (split-string (buffer-substring
+					(line-beginning-position)
+					(line-end-position))
+				       "/"))
+		 (text (nth 1 fields)))
 	    (when text
 	      (if (string= (nth 0 fields) "D")
 		  (setq text (file-name-as-directory text)))