auto upstream

4 files changed, 38 insertions, 39 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d6de9baa118..c5a902d6442 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2013-02-26  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-sh-handle-insert-directory): Add
+        "2>/dev/null" to the ls command, in case "en_US.utf8" is not
+        defined.  POSIX environments fall back to the "C" locale then and
+        emit a warning, which shall be suppressed.
+
+2013-02-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Tweak logic.
+        (easy-mmode-set-keymap-parents): Use make-composed-keymap.
+
+2013-02-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/bytecomp.el (byte-compile-file): Use let.
+
 2013-02-25  Juri Linkov  <juri@jurta.org>
 
         * replace.el (read-regexp): Let-bind `default' to the first
@@ -57,8 +73,8 @@
         (tramp-default-method): Adapt check for
         `tramp-ssh-controlmaster-options'.
 
-        * net/tramp-sh.el (tramp-methods): Replace
-        `tramp-ssh-controlmaster-template' by "%c".
+        * net/tramp-sh.el (tramp-methods):
+        Replace `tramp-ssh-controlmaster-template' by "%c".
         (tramp-do-copy-or-rename-file-out-of-band)
         (tramp-maybe-open-connection): Use it in format spec.  Ensure,
         that it is applied for the first hop only.
@@ -80,8 +96,8 @@
 
         * net/tramp.el (tramp-tramp-file-p): Fix docstring.
 
-        * net/tramp-sh.el (tramp-sh-handle-insert-directory): Handle
-        multibyte file names.
+        * net/tramp-sh.el (tramp-sh-handle-insert-directory):
+        Handle multibyte file names.
 
 2013-02-22  Glenn Morris  <rgm@gnu.org>
 
@@ -104,8 +120,8 @@
 
 2013-02-21  Fabián Ezequiel Gallina  <fgallina@cuca>
 
-        * progmodes/python.el (python-info-current-defun): Enhance
-        match-data cluttering prevention.
+        * progmodes/python.el (python-info-current-defun):
+        Enhance match-data cluttering prevention.
 
 2013-02-21  Glenn Morris  <rgm@gnu.org>
 
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index e0837033c74..5db1793a407 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1781,15 +1781,13 @@ The value is non-nil if there were no errors, nil if errors."
       (when byte-compile-verbose
         (message "Compiling %s..." filename))
       (setq byte-compiler-error-flag nil)
-      (setq byte-compile-level (1+ byte-compile-level))
       ;; It is important that input-buffer not be current at this call,
       ;; so that the value of point set in input-buffer
       ;; within byte-compile-from-buffer lingers in that buffer.
       (setq output-buffer
             (save-current-buffer
-              (unwind-protect
-                  (byte-compile-from-buffer input-buffer)
-                (setq byte-compile-level (1- byte-compile-level)))))
+              (let ((byte-compile-level (1+ byte-compile-level)))
+                (byte-compile-from-buffer input-buffer))))
       (if byte-compiler-error-flag
           nil
         (when byte-compile-verbose
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index 2088e690228..abe7b1ea741 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -359,10 +359,8 @@ on if the hook has explicitly disabled it."
          (MODE-check-buffers
           (intern (concat global-mode-name "-check-buffers")))
          (MODE-cmhh (intern (concat global-mode-name "-cmhh")))
-         (MODE-disable-in-buffer
-          (intern (concat global-mode-name "-disable-in-buffer")))
          (minor-MODE-hook (intern (concat mode-name "-hook")))
-         (disable-MODE (intern (concat "disable-" mode-name)))
+         (MODE-set-explicitly (intern (concat mode-name "-set-explicitly")))
          (MODE-major-mode (intern (concat (symbol-name mode) "-major-mode")))
          keyw)
 
@@ -409,8 +407,6 @@ See `%s' for more information on %s."
                (add-hook 'find-file-hook ',MODE-check-buffers)
                (add-hook 'change-major-mode-hook ',MODE-cmhh))
            (remove-hook 'after-change-major-mode-hook ',MODE-enable-in-buffers)
-           (remove-hook 'change-major-mode-after-body-hook
-                        ',MODE-enable-in-buffers)
            (remove-hook 'find-file-hook ',MODE-check-buffers)
            (remove-hook 'change-major-mode-hook ',MODE-cmhh))
 
@@ -425,7 +421,7 @@ See `%s' for more information on %s."
 
        ;; A function which checks whether MODE has been disabled in the major
        ;; mode hook which has just been run.
-       (add-hook ',minor-MODE-hook ',MODE-disable-in-buffer)
+       (add-hook ',minor-MODE-hook ',MODE-set-explicitly)
 
        ;; List of buffers left to process.
        (defvar ,MODE-buffers nil)
@@ -435,8 +431,7 @@ See `%s' for more information on %s."
          (dolist (buf ,MODE-buffers)
            (when (buffer-live-p buf)
              (with-current-buffer buf
-               (if ,disable-MODE
-                   (if ,mode (,mode -1))
+               (unless ,MODE-set-explicitly
                  (unless (eq ,MODE-major-mode major-mode)
                    (if ,mode
                        (progn
@@ -457,30 +452,20 @@ See `%s' for more information on %s."
          (add-to-list ',MODE-buffers (current-buffer))
          (add-hook 'post-command-hook ',MODE-check-buffers))
        (put ',MODE-cmhh 'definition-name ',global-mode)
-       ;; disable-MODE is set in MODE-disable-in-buffer and cleared by
+       ;; MODE-set-explicitly is set in MODE-set-explicitly and cleared by
        ;; kill-all-local-variables.
-       (defvar-local ,disable-MODE nil)
-       (defun ,MODE-disable-in-buffer ()
-         (unless ,mode
-           (setq ,disable-MODE t)))
-       (put ',MODE-disable-in-buffer 'definition-name ',global-mode))))
+       (defvar-local ,MODE-set-explicitly nil)
+       (defun ,MODE-set-explicitly ()
+         (setq ,MODE-set-explicitly t))
+       (put ',MODE-set-explicitly 'definition-name ',global-mode))))
 
 ;;;
 ;;; easy-mmode-defmap
 ;;;
 
-(eval-and-compile
-  (if (fboundp 'set-keymap-parents)
-      (defalias 'easy-mmode-set-keymap-parents 'set-keymap-parents)
-    (defun easy-mmode-set-keymap-parents (m parents)
-      (set-keymap-parent
-       m
-       (cond
-        ((not (consp parents)) parents)
-        ((not (cdr parents)) (car parents))
-        (t (let ((m (copy-keymap (pop parents))))
-             (easy-mmode-set-keymap-parents m parents)
-             m)))))))
+(defun easy-mmode-set-keymap-parents (m parents)
+  (set-keymap-parent
+   m (if (cdr parents) (make-composed-keymap parents) (car parents))))
 
 ;;;###autoload
 (defun easy-mmode-define-keymap (bs &optional name m args)
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index e63acb6b40e..e2aaafb38dd 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2593,12 +2593,12 @@ This is like `dired-recursive-delete-directory' for Tramp files."
       ;; If `full-directory-p', we just say `ls -l FILENAME'.
       ;; Else we chdir to the parent directory, then say `ls -ld BASENAME'.
       ;; "--dired" returns byte positions.  Therefore, the file names
-      ;; must be encoded, which is guaranteed by "LC_ALL=en_US.UTF8
+      ;; must be encoded, which is guaranteed by "LC_ALL=en_US.utf8
       ;; LC_CTYPE=''".
       (if full-directory-p
           (tramp-send-command
            v
-           (format "env LC_ALL=en_US.UTF8 LC_CTYPE='' %s %s %s 2>/dev/null"
+           (format "env LC_ALL=en_US.utf8 LC_CTYPE='' %s %s %s 2>/dev/null"
                    (tramp-get-ls-command v)
                    switches
                    (if wildcard
@@ -2614,7 +2614,7 @@ This is like `dired-recursive-delete-directory' for Tramp files."
           (tramp-run-real-handler 'file-name-directory (list localname))))
         (tramp-send-command
          v
-         (format "env LC_ALL=en_US.UTF8 LC_CTYPE='' %s %s %s"
+         (format "env LC_ALL=en_US.utf8 LC_CTYPE='' %s %s %s 2>/dev/null"
                  (tramp-get-ls-command v)
                  switches
                  (if (or wildcard