upstream

15 files changed, 76 insertions, 20 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ec867fee08b..0927ff478c2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,39 @@
+2011-09-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * simple.el (delete-trailing-whitespace): Fix last change.
+
+        * progmodes/perl-mode.el (perl-syntax-propertize-function):
+        Don't confuse "y => 3" as the beginning of a `y' operation.
+
+        * emacs-lisp/debug.el (debug-convert-byte-code): Don't assume the
+        object has more than 4 slots (bug#9613).
+
+2011-09-28  Juanma Barranquero  <lekktu@gmail.com>
+
+        * subr.el (with-output-to-temp-buffer):
+        * net/quickurl.el (quickurl, quickurl-browse-url):
+        Fix typos in docstrings.
+
+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.
+
 2011-09-27  Leo Liu  <sdl.web@gmail.com>
 
         * ido.el (ido-read-internal): Accept cons cell HIST arg.
diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13
index 8cbe1ad5776..993c51163cb 100644
--- a/lisp/ChangeLog.13
+++ b/lisp/ChangeLog.13
@@ -1743,7 +1743,7 @@
         auto-composition-function to it.
         (toggle-auto-composition): New function.
 
-        * international/characters.el: Make all chararacters in the
+        * international/characters.el: Make all characters in the
         charset tibetan to tibetan script.
 
         * international/mule-conf.el (tibetan): Fix :code-space property.
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index d7021a46165..d05a518e590 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -869,8 +869,10 @@ To specify a nil argument interactively, exit with an empty minibuffer."
                  ,defn
                  ,@(remq '&rest (remq '&optional args))))))
         (if (> (length defn) 5)
+            ;; The mere presence of field 5 is sufficient to make
+            ;; it interactive.
             (push `(interactive ,(aref defn 5)) body))
-        (if (aref defn 4)
+        (if (and (> (length defn) 4) (aref defn 4))
             ;; Use `documentation' here, to get the actual string,
             ;; in case the compiled function has a reference
             ;; to the .elc file.
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 4cab8f43480..2e340a442a6 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1658,10 +1658,11 @@ The list is displayed in a buffer named `*Packages*'."
     (switch-to-buffer buf))
   (let ((upgrades (package-menu--find-upgrades)))
     (if upgrades
-        (message "%d package%s can be upgraded; type `%s' to mark them for upgrading."
+        (message "%d package%s can be upgraded; type `%s' to mark %s for upgrading."
                  (length upgrades)
                  (if (= (length upgrades) 1) "" "s")
-                 (substitute-command-keys "\\[package-menu-mark-upgrades]")))))
+                 (substitute-command-keys "\\[package-menu-mark-upgrades]")
+                 (if (= (length upgrades) 1) "it" "them")))))
 
 ;;;###autoload
 (defalias 'package-list-packages 'list-packages)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index c535f4a9549..a330d5c6be8 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -3,6 +3,11 @@
         * plstore.el (plstore-select-keys, plstore-encrypt-to): Clarify
         documentation.
 
+2011-09-27  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-uu.el (gnus-uu-grab-articles): Require gnus-async so that
+        `gnus-asynchronous' isn't shadowed.
+
 2011-09-26  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * nnimap.el (nnimap-wait-for-response): Message less (bug#9540).
diff --git a/lisp/gnus/gnus-uu.el b/lisp/gnus/gnus-uu.el
index 05ba3595479..15c3d41bece 100644
--- a/lisp/gnus/gnus-uu.el
+++ b/lisp/gnus/gnus-uu.el
@@ -1290,6 +1290,7 @@ When called interactively, prompt for REGEXP."
 ;; the process-function has been successful and nil otherwise.
 (defun gnus-uu-grab-articles (articles process-function
                                        &optional sloppy limit no-errors)
+  (require 'gnus-async)
   (let ((state 'first)
         (gnus-asynchronous nil)
         (gnus-inhibit-treatment t)
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/net/quickurl.el b/lisp/net/quickurl.el
index 712f0b0c924..3f1437f0799 100644
--- a/lisp/net/quickurl.el
+++ b/lisp/net/quickurl.el
@@ -307,7 +307,7 @@ Also display a `message' saying what the URL was unless SILENT is non-nil."
   "Insert a URL based on LOOKUP.
 
 If not supplied LOOKUP is taken to be the word at point in the current
-buffer, this default action can be modifed via
+buffer, this default action can be modified via
 `quickurl-grab-lookup-function'."
   (interactive)
   (when (or lookup
@@ -402,7 +402,7 @@ is decided."
   "Browse the URL associated with LOOKUP.
 
 If not supplied LOOKUP is taken to be the word at point in the
-current buffer, this default action can be modifed via
+current buffer, this default action can be modified via
 `quickurl-grab-lookup-function'."
   (interactive)
   (when (or lookup
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 1c320f20e51..9fbeb9f1882 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * org.el (org-mode): Force left-to-right paragraphs in Org
+        buffers.  For a related discussions, see
+        https://lists.gnu.org/archive/html/emacs-devel/2011-09/msg00349.html.
+
 2011-09-17  Juanma Barranquero  <lekktu@gmail.com>
 
         * org.el (org-toggle-pretty-entities): Fix typo in message.
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 32ca5288d6e..da39aa189ba 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -4748,6 +4748,7 @@ The following commands are available:
     (org-set-local 'line-move-ignore-invisible t))
   (org-set-local 'outline-regexp org-outline-regexp)
   (org-set-local 'outline-level 'org-outline-level)
+  (setq bidi-paragraph-direction 'left-to-right)
   (when (and org-ellipsis
              (fboundp 'set-display-table-slot) (boundp 'buffer-display-table)
              (fboundp 'make-glyph-code))
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)))
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index 8ca8c690f92..933f004bb5d 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -304,11 +304,12 @@ The expansion is entirely correct because it uses the C preprocessor."
              (put-text-property (match-beginning 2) (match-end 2)
                                 'syntax-table (string-to-syntax "\""))
              (perl-syntax-propertize-special-constructs end)))))
-      ("\\(^\\|[?:.,;=!~({[ \t]\\)\\([msy]\\|q[qxrw]?\\|tr\\)\\>\\s-*\\([^])}> \n\t]\\)"
+      ("\\(^\\|[?:.,;=!~({[ \t]\\)\\([msy]\\|q[qxrw]?\\|tr\\)\\>\\s-*\\(?:\\([^])}>= \n\t]\\)\\|\\(?3:=\\)[^>]\\)"
        ;; Nasty cases:
        ;; /foo/m  $a->m  $#m $m @m %m
        ;; \s (appears often in regexps).
        ;; -s file
+       ;; y => 3
        ;; sub tr {...}
        (3 (ignore
            (if (save-excursion (goto-char (match-beginning 0))
diff --git a/lisp/simple.el b/lisp/simple.el
index 142270930ca..14ce5ed18ec 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -589,9 +589,9 @@ If the region is active, only delete whitespace within the region."
         ;; Delete trailing empty lines.
         (goto-char end-marker)
         (when (and (not end)
-                   (<= (skip-chars-backward "\n") -2)
                    ;; Really the end of buffer.
-                   (save-restriction (widen) (eobp)))
+                   (save-restriction (widen) (eobp))
+                   (<= (skip-chars-backward "\n") -2))
           (delete-region (1+ (point)) end-marker))
         (set-marker end-marker nil))))
   ;; Return nil for the benefit of `write-file-functions'.
diff --git a/lisp/subr.el b/lisp/subr.el
index 1aa714fa883..4946f3eef7a 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3002,7 +3002,7 @@ Instead it binds `standard-output' to that buffer, so that output
 generated with `prin1' and similar functions in BODY goes into
 the buffer.
 
-At the end of BODY, this marks buffer BUFNAME unmodifed and displays
+At the end of BODY, this marks buffer BUFNAME unmodified and displays
 it in a window, but does not select it.  The normal way to do this is
 by calling `display-buffer', then running `temp-buffer-show-hook'.
 However, if `temp-buffer-show-function' is non-nil, it calls that