auto upstream

7 files changed, 41 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fdf12be0a1c..b676835bfef 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,21 @@
+2013-02-03  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-debug-message): Extend function exclude list.
+        (tramp-backtrace): New defun.
+        (tramp-handle-insert-file-contents): Use `visit' when inserting
+        the local copy.
+
+        * net/tramp-sh.el (tramp-sh-handle-set-visited-file-modtime): Use
+        `remote-file-name-inhibit-cache'.
+
+2013-02-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/cperl-mode.el (cperl-mode): Avoid byte-compile warning
+        (bug#13614).
+
+        * subr.el (internal--called-interactively-p--get-frame): Avoid filling
+        current-load-list (bug#13366).
+
 2013-02-02  Christopher Schmidt  <christopher@ch.ristopher.com>
 
         * progmodes/compile.el (compilation-error-regexp-alist-alist):
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 345da7b958f..bfa145ac780 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -1330,7 +1330,8 @@ target of the symlink differ."
     (let ((f (buffer-file-name))
           coding-system-used)
       (with-parsed-tramp-file-name f nil
-        (let* ((attr (file-attributes f))
+        (let* ((remote-file-name-inhibit-cache t)
+               (attr (file-attributes f))
                ;; '(-1 65535) means file doesn't exists yet.
                (modtime (or (nth 5 attr) '(-1 65535))))
           (when (boundp 'last-coding-system-used)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 1dee9e89676..7743e10c8d4 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1391,7 +1391,9 @@ ARGS to actually emit the message (if applicable)."
                      (concat
                       "^"
                       (regexp-opt
-                       '("tramp-compat-funcall"
+                       '("tramp-backtrace"
+                         "tramp-compat-condition-case-unless-debug"
+                         "tramp-compat-funcall"
                          "tramp-compat-with-temp-message"
                          "tramp-debug-message"
                          "tramp-error"
@@ -1505,6 +1507,11 @@ an input event arrives.  The other arguments are passed to `tramp-error'."
              "`M-x tramp-cleanup-this-connection'"))
           (sit-for 30))))))
 
+(defsubst tramp-backtrace (vec-or-proc)
+  "Dump a backtrace into the debug buffer.
+This function is meant for debugging purposes."
+  (tramp-message vec-or-proc 10 "\n%s" (with-output-to-string (backtrace))))
+
 (defmacro with-parsed-tramp-file-name (filename var &rest body)
   "Parse a Tramp filename and make components available in the body.
 
@@ -3023,13 +3030,15 @@ User is always nil."
                   (setq tramp-temp-buffer-file-name local-copy))
 
                 ;; We must ensure that `file-coding-system-alist'
-                ;; matches `local-copy'.
+                ;; matches `local-copy'.  We must also use `visit',
+                ;; otherwise there might be an error in the
+                ;; `revert-buffer' function under XEmacs.
                 (let ((file-coding-system-alist
                        (tramp-find-file-name-coding-system-alist
                         filename local-copy)))
                   (setq result
                         (insert-file-contents
-                         local-copy nil nil nil replace)))))
+                         local-copy visit nil nil replace)))))
 
           ;; Save exit.
           (progn
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index c302bb484af..7d34269b6b5 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -1839,7 +1839,7 @@ or as help on variables `cperl-tips', `cperl-problems',
   (make-local-variable 'cperl-syntax-state)
   (setq cperl-syntax-state nil)         ; reset syntaxification cache
   (if cperl-use-syntax-table-text-property
-      (if (boundp 'syntax-propertize-function)
+      (if (eval-when-compile (fboundp 'syntax-propertize-rules))
           (progn
             ;; Reset syntaxification cache.
             (set (make-local-variable 'cperl-syntax-done-to) nil)
diff --git a/lisp/subr.el b/lisp/subr.el
index e1ab5298409..31cbb9a0a8a 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3976,12 +3976,13 @@ the number of frames to skip (minus 1).")
   ;; "static" variables.
   (let ((sym (make-symbol "base-index")))
     `(progn
-       (defvar ,sym
+       (defvar ,sym)
+       (unless (boundp ',sym)
          (let ((i 1))
            (while (not (eq (indirect-function (nth 1 (backtrace-frame i)) t)
                            (indirect-function 'called-interactively-p)))
              (setq i (1+ i)))
-           i))
+           (setq ,sym i)))
        ;; (unless (eq (nth 1 (backtrace-frame ,sym)) 'called-interactively-p)
        ;;   (error "called-interactively-p: %s is out-of-sync!" ,sym))
        (backtrace-frame (+ ,sym ,n)))))
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 969d3c7d269..72842ad188d 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * url-cache.el (url-cache-create-filename-using-md5): Don't waste your
+        time `requiring' a builtin feature.
+
 2012-12-22  Takafumi Arakaki  <aka.tkf@gmail.com>  (tiny change)
 
         * url-http.el (url-http-end-of-document-sentinel): Bind relevant
diff --git a/lisp/url/url-cache.el b/lisp/url/url-cache.el
index a5e5ebf1ed4..cb0281b87f2 100644
--- a/lisp/url/url-cache.el
+++ b/lisp/url/url-cache.el
@@ -149,7 +149,6 @@ The actual return value is the last modification time of the cache file."
 (defun url-cache-create-filename-using-md5 (url)
   "Create a cached filename using MD5.
 Very fast if you have an `md5' primitive function, suitably fast otherwise."
-  (require 'md5)
   (if url
       (let* ((checksum (md5 url))
              (urlobj (url-generic-parse-url url))