Merge from emacs-24; up to 2012-04-21T14:12:27Z!sdl.web@gmail.com

5 files changed, 67 insertions, 21 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e2bc5619419..e9d849691fd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,37 @@
+2012-05-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * shell.el (shell-completion-vars): Fix last change (bug#11348).
+
+2012-05-09  Chong Yidong  <cyd@gnu.org>
+
+        * ansi-color.el (ansi-color-process-output): Check for validity of
+        comint-last-output-start before using it.  This avoids a bad
+        interaction with gdb-mi's input/output buffer.
+
+2012-05-09  Glenn Morris  <rgm@gnu.org>
+
+        * files.el (dir-locals-read-from-file):
+        Mention dir-locals in any error message.
+
+2012-05-09  Chong Yidong  <cyd@gnu.org>
+
+        * emacs-lisp/package.el (package-built-in-p): Handle the `emacs'
+        package (Bug#11410).
+
+        * emacs-lisp/package.el (package-buffer-info): Avoid putting local
+        variables into description.
+
+2012-05-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * shell.el (shell-completion-vars): Set pcomplete-arg-quote-list like
+        shell-delimiter-argument-list (bug#11348).
+        (shell-parse-pcomplete-arguments): Obey pcomplete-arg-quote-list.
+
+2012-05-09  Chong Yidong  <cyd@gnu.org>
+
+        * select.el (xselect--encode-string): Always use utf-8 for TEXT on
+        Nextstep.
+
 2012-05-09  Juanma Barranquero  <lekktu@gmail.com>
 
         * textmodes/rst.el: Silence byte-compiler warnings.
diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el
index 15a543e9591..6a82f176676 100644
--- a/lisp/ansi-color.el
+++ b/lisp/ansi-color.el
@@ -217,8 +217,12 @@ The comint output is assumed to lie between the marker
 `comint-last-output-start' and the process-mark.
 
 This is a good function to put in `comint-output-filter-functions'."
-  (let ((start-marker (or comint-last-output-start
-                          (point-min-marker)))
+  (let ((start-marker (if (and (markerp comint-last-output-start)
+                               (eq (marker-buffer comint-last-output-start)
+                                   (current-buffer))
+                               (marker-position comint-last-output-start))
+                          comint-last-output-start
+                        (point-min-marker)))
         (end-marker (process-mark (get-buffer-process (current-buffer)))))
     (cond ((eq ansi-color-for-comint-mode nil))
           ((eq ansi-color-for-comint-mode 'filter)
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 4b868f72899..66370c643bf 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -469,8 +469,11 @@ NAME and VERSION are both strings."
 Optional arg MIN-VERSION, if non-nil, should be a version list
 specifying the minimum acceptable version."
   (require 'finder-inf nil t) ; For `package--builtins'.
-  (let ((elt (assq package package--builtins)))
-    (and elt (version-list-<= min-version (package-desc-vers (cdr elt))))))
+  (if (eq package 'emacs)
+      (version-list-<= min-version (version-to-list emacs-version))
+    (let ((elt (assq package package--builtins)))
+      (and elt (version-list-<= min-version
+                                (package-desc-vers (cdr elt)))))))
 
 ;; This function goes ahead and activates a newer version of a package
 ;; if an older one was already activated.  This is not ideal; we'd at
@@ -943,7 +946,7 @@ If the buffer does not contain a conforming package, signal an
 error.  If there is a package, narrow the buffer to the file's
 boundaries."
   (goto-char (point-min))
-  (unless (re-search-forward "^;;; \\([^ ]*\\)\\.el --- \\(.*\\)$" nil t)
+  (unless (re-search-forward "^;;; \\([^ ]*\\)\\.el ---[ \t]*\\(.*?\\)[ \t]*\\(-\\*-.*-\\*-[ \t]*\\)?$" nil t)
     (error "Packages lacks a file header"))
   (let ((file-name (match-string-no-properties 1))
         (desc      (match-string-no-properties 2))
diff --git a/lisp/files.el b/lisp/files.el
index 7ee0707d7b7..2870fedf967 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3629,19 +3629,21 @@ FILE is the name of the file holding the variables to apply.
 The new class name is the same as the directory in which FILE
 is found.  Returns the new class name."
   (with-temp-buffer
-    ;; Errors reading the file are not very informative.
-    ;; Eg just "Error: (end-of-file)" does not give any clue that the
-    ;; problem is related to dir-locals.
-    (with-demoted-errors
-      (insert-file-contents file)
-      (let* ((dir-name (file-name-directory file))
-             (class-name (intern dir-name))
-             (variables (let ((read-circle nil))
-                          (read (current-buffer)))))
-        (dir-locals-set-class-variables class-name variables)
-        (dir-locals-set-directory-class dir-name class-name
-                                        (nth 5 (file-attributes file)))
-        class-name))))
+    ;; This is with-demoted-errors, but we want to mention dir-locals
+    ;; in any error message.
+    (let (err)
+      (condition-case err
+          (progn
+            (insert-file-contents file)
+            (let* ((dir-name (file-name-directory file))
+                   (class-name (intern dir-name))
+                   (variables (let ((read-circle nil))
+                                (read (current-buffer)))))
+              (dir-locals-set-class-variables class-name variables)
+              (dir-locals-set-directory-class dir-name class-name
+                                              (nth 5 (file-attributes file)))
+              class-name))
+        (error (message "Error reading dir-locals: %S" err) nil)))))
 
 (defun hack-dir-local-variables ()
   "Read per-directory local variables for the current buffer.
diff --git a/lisp/shell.el b/lisp/shell.el
index 7c5ce49a967..f7a530102ff 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -393,8 +393,11 @@ Thus, this does not include the shell's current directory.")
             (goto-char (match-end 0))
             (cond
              ((match-beginning 3)       ;Backslash escape.
-              (push (if (= (match-beginning 3) (match-end 3))
-                        "\\" (match-string 3))
+              (push (cond
+                     ((null pcomplete-arg-quote-list)
+                      (goto-char (match-beginning 3)) "\\")
+                     ((= (match-beginning 3) (match-end 3)) "\\")
+                     (t (match-string 3)))
                     arg))
              ((match-beginning 2)       ;Double quote.
               (push (replace-regexp-in-string
@@ -429,7 +432,7 @@ Shell buffers.  It implements `shell-completion-execonly' for
   (set (make-local-variable 'pcomplete-parse-arguments-function)
        #'shell-parse-pcomplete-arguments)
   (set (make-local-variable 'pcomplete-arg-quote-list)
-       (append "\\ \t\n\r\"'`$|&;(){}[]<>#" nil))
+       comint-file-name-quote-list)
   (set (make-local-variable 'pcomplete-termination-string)
        (cond ((not comint-completion-addsuffix) "")
              ((stringp comint-completion-addsuffix)