auto upstream

9 files changed, 136 insertions, 72 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index abcf6578060..68cff2f6d29 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,49 @@
+2013-02-21  Bastien Guerry  <bzg@gnu.org>
+
+        * cmuscheme.el (scheme-buffer): Fix docstring.  (Bug#13778)
+
+2013-02-21  Fabián Ezequiel Gallina  <fgallina@cuca>
+
+        * progmodes/python.el (python-info-current-defun): Enhance
+        match-data cluttering prevention.
+
+2013-02-21  Glenn Morris  <rgm@gnu.org>
+
+        * net/tramp.el (tramp-get-debug-buffer): Ensure outline.el is not
+        loaded while outline-regexp is let bound.  (Bug#9584)
+
+2013-02-21  Fabián Ezequiel Gallina  <fgallina@cuca>
+
+        * progmodes/python.el (python-info-current-defun): Fix failed
+        defun name retrieval because of unwanted match-data cluttering.
+
+2013-02-21  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-ssh-controlmaster-template): Make it a
+        defconst.  Apply independent check for ControlPersist.
+
+        * net/tramp-sh.el (tramp-sh-handle-set-file-times): Set $UTC only
+        temporarily, via "env".
+
+2013-02-21  Glenn Morris  <rgm@gnu.org>
+
+        * info.el (Info-enable-edit): Remove.
+        (Info-edit): Disable it rather than using Info-enable.
+        (Info-edit-mode-hook, Info-edit-map, Info-edit-mode, Info-edit)
+        (Info-cease-edit): Make editing of Info files obsolete.
+
+        * informat.el (Info-tagify):
+        Handle buffers not visiting files.  (Bug#13763)
+
+2013-02-21  Juanma Barranquero  <lekktu@gmail.com>
+
+        * calc/calc-graph.el (calc-graph-show-dumb): Fix typo.
+
+2013-02-21  Glenn Morris  <rgm@gnu.org>
+
+        * files.el (basic-save-buffer): Move check for existing parent
+        directory after hooks.  (Bug#13773)
+
 2013-02-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * simple.el (command-execute): Move from C.  Add obsolete check.
diff --git a/lisp/calc/calc-graph.el b/lisp/calc/calc-graph.el
index c84c7fdf949..16fc6c09dbe 100644
--- a/lisp/calc/calc-graph.el
+++ b/lisp/calc/calc-graph.el
@@ -948,7 +948,7 @@ This \"dumb\" driver will be present in Gnuplot 3.0."
           (setq calc-dumb-map (make-sparse-keymap))
           (define-key calc-dumb-map "\n" 'scroll-up-command)
           (define-key calc-dumb-map " " 'scroll-up-command)
-          (define-key calc-dump-map [?\S-\ ] 'scroll-down-command)
+          (define-key calc-dumb-map [?\S-\ ] 'scroll-down-command)
           (define-key calc-dumb-map "\177" 'scroll-down-command)
           (define-key calc-dumb-map "<" 'scroll-left)
           (define-key calc-dumb-map ">" 'scroll-right)
diff --git a/lisp/cmuscheme.el b/lisp/cmuscheme.el
index d40822188ee..130eb374538 100644
--- a/lisp/cmuscheme.el
+++ b/lisp/cmuscheme.el
@@ -447,7 +447,7 @@ in the next one.")
                                             "\"\)\n")))
 
 
-(defvar scheme-buffer nil "*The current scheme process buffer.
+(defvar scheme-buffer nil "The current scheme process buffer.
 
 MULTIPLE PROCESS SUPPORT
 ===========================================================================
diff --git a/lisp/files.el b/lisp/files.el
index f9ed65b8ac0..f9d02511839 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4563,15 +4563,8 @@ Before and after saving the buffer, this function runs
                  (not (file-exists-p buffer-file-name))))
         (let ((recent-save (recent-auto-save-p))
               setmodes)
-          (if buffer-file-name
-              (let ((dir (file-name-directory
-                          (expand-file-name buffer-file-name))))
-                (unless (file-exists-p dir)
-                  (if (y-or-n-p
-                       (format "Directory `%s' does not exist; create? " dir))
-                      (make-directory dir t)
-                    (error "Canceled"))))
             ;; If buffer has no file name, ask user for one.
+          (or buffer-file-name
             (let ((filename
                    (expand-file-name
                     (read-file-name "File to save in: "
@@ -4628,7 +4621,14 @@ Before and after saving the buffer, this function runs
                 (run-hook-with-args-until-success 'write-file-functions)
                 ;; If a hook returned t, file is already "written".
                 ;; Otherwise, write it the usual way now.
-                (setq setmodes (basic-save-buffer-1)))
+                (let ((dir (file-name-directory
+                            (expand-file-name buffer-file-name))))
+                  (unless (file-exists-p dir)
+                    (if (y-or-n-p
+                         (format "Directory `%s' does not exist; create? " dir))
+                        (make-directory dir t)
+                      (error "Canceled")))
+                  (setq setmodes (basic-save-buffer-1))))
             ;; Now we have saved the current buffer.  Let's make sure
             ;; that buffer-file-coding-system is fixed to what
             ;; actually used for saving by binding it locally.
diff --git a/lisp/info.el b/lisp/info.el
index 24a7181ff52..3792857d47a 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -59,15 +59,6 @@ to the user."
   :group 'info
   :version "24.1")
 
-(defcustom Info-enable-edit nil
-  "Non-nil means the \\<Info-mode-map>\\[Info-edit] command in Info can edit the current node.
-This is convenient if you want to write Info files by hand.
-However, we recommend that you not do this.
-It is better to write a Texinfo file and generate the Info file from that,
-because that gives you a printed manual as well."
-  :type 'boolean
-  :group 'info)
-
 (defvar Info-enable-active-nodes nil
   "Non-nil allows Info to execute Lisp code associated with nodes.
 The Lisp code is executed when the node is selected.")
@@ -375,6 +366,9 @@ with wrapping around the current Info node."
 (defvar Info-edit-mode-hook nil
   "Hooks run when `Info-edit-mode' is called.")
 
+(make-obsolete-variable 'Info-edit-mode-hook
+                        "editing Info nodes by hand is not recommended." "24.4")
+
 (defvar Info-current-file nil
   "Info file that Info is now looking at, or nil.
 This is the name that was specified in Info, not the actual file name.
@@ -4253,6 +4247,10 @@ Advanced commands:
                         map)
   "Local keymap used within `e' command of Info.")
 
+(make-obsolete-variable 'Info-edit-map
+                        "editing Info nodes by hand is not recommended."
+                        "24.4")
+
 ;; Info-edit mode is suitable only for specially formatted data.
 (put 'Info-edit-mode 'mode-class 'special)
 
@@ -4270,16 +4268,22 @@ which returns to Info mode for browsing.
   (buffer-enable-undo (current-buffer))
   (run-mode-hooks 'Info-edit-mode-hook))
 
+(make-obsolete 'Info-edit-mode
+               "editing Info nodes by hand is not recommended." "24.4")
+
 (defun Info-edit ()
-  "Edit the contents of this Info node.
-Allowed only if variable `Info-enable-edit' is non-nil."
+  "Edit the contents of this Info node."
   (interactive)
-  (or Info-enable-edit
-      (error "Editing Info nodes is not enabled"))
   (Info-edit-mode)
   (message "%s" (substitute-command-keys
                  "Editing: Type \\<Info-edit-map>\\[Info-cease-edit] to return to info")))
 
+(put 'Info-edit 'disabled "Editing Info nodes by hand is not recommended.
+This feature will be removed in future.")
+
+(make-obsolete 'Info-edit
+               "editing Info nodes by hand is not recommended." "24.4")
+
 (defun Info-cease-edit ()
   "Finish editing Info node; switch back to Info proper."
   (interactive)
@@ -4296,6 +4300,9 @@ Allowed only if variable `Info-enable-edit' is non-nil."
   (and (marker-position Info-tag-table-marker)
        (buffer-modified-p)
        (message "Tags may have changed.  Use Info-tagify if necessary")))
+
+(make-obsolete 'Info-cease-edit
+               "editing Info nodes by hand is not recommended." "24.4")
 
 (defvar Info-file-list-for-emacs
   '("ediff" "eudc" "forms" "gnus" "info" ("Info" . "info") ("mh" . "mh-e")
diff --git a/lisp/informat.el b/lisp/informat.el
index d4412b8a86a..53b043fbbad 100644
--- a/lisp/informat.el
+++ b/lisp/informat.el
@@ -43,14 +43,17 @@
   ;; save-restrictions would not work
   ;; because it records the old max relative to the end.
   ;; We record it relative to the beginning.
-  (if input-buffer-name
-      (message "Tagifying region in %s ..." input-buffer-name)
-      (message
-       "Tagifying %s ..."  (file-name-nondirectory (buffer-file-name))))
   (let ((omin (point-min))
         (omax (point-max))
         (nomax (= (point-max) (1+ (buffer-size))))
-        (opoint (point)))
+        (opoint (point))
+        (msg (format "Tagifying %s..."
+                     (cond (input-buffer-name
+                            (format "region in %s" input-buffer-name))
+                           (buffer-file-name
+                            (file-name-nondirectory (buffer-file-name)))
+                           (t "buffer")))))
+    (message "%s" msg)
     (unwind-protect
     (progn
       (widen)
@@ -148,11 +151,8 @@
                 (insert "\^_\nEnd tag table\n")))))
       (goto-char opoint)
       (narrow-to-region omin (if nomax (1+ (buffer-size))
-                               (min omax (point-max))))))
-  (if input-buffer-name
-      (message "Tagifying region in %s done" input-buffer-name)
-      (message
-       "Tagifying %s done"  (file-name-nondirectory (buffer-file-name)))))
+                               (min omax (point-max)))))
+    (message "%sdone" msg)))
 
 
 ;;;###autoload
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 7388c570874..82cbda57086 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -1410,7 +1410,7 @@ of."
               (utc (not (featurep 'xemacs))))
           (tramp-send-command-and-check
            v (format "%s touch -t %s %s"
-                     (if utc "TZ=UTC; export TZ;" "")
+                     (if utc "env TZ=UTC" "")
                      (if utc
                          (format-time-string "%Y%m%d%H%M.%S" time t)
                        (format-time-string "%Y%m%d%H%M.%S" time))
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 89648b0e9a9..4bfe541f053 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -281,16 +281,24 @@ started on the local host.  You should specify a remote host
 useful only in combination with `tramp-default-proxies-alist'.")
 
 ;;;###tramp-autoload
-(defvar tramp-ssh-controlmaster-template
+(defconst tramp-ssh-controlmaster-template
+  (let (result)
     (ignore-errors
       (with-temp-buffer
         (call-process "ssh" nil t nil "-o" "ControlMaster")
         (goto-char (point-min))
         (when (search-forward-regexp "Missing ControlMaster argument" nil t)
-          '("-o" "ControlPath=%t.%%r@%%h:%%p"
-            "-o" "ControlMaster=auto"
-            "-o" "ControlPersist=no"))))
-    "Call ssh to detect whether it supports the ControlMaster argument.
+          (setq result
+                '("-o" "ControlPath=%t.%%r@%%h:%%p"
+                  "-o" "ControlMaster=auto"))))
+      (when result
+        (with-temp-buffer
+          (call-process "ssh" nil t nil "-o" "ControlPersist")
+          (goto-char (point-min))
+          (when (search-forward-regexp "Missing ControlPersist argument" nil t)
+            (setq result (append result '("-o" "ControlPersist=no")))))))
+    result)
+    "Call ssh to detect whether it supports the Control* arguments.
 Return a template to be used in `tramp-methods'.")
 
 (defcustom tramp-default-method
@@ -1346,6 +1354,8 @@ The outline level is equal to the verbosity of the Tramp message."
       (get-buffer-create (tramp-debug-buffer-name vec))
     (when (bobp)
       (setq buffer-undo-list t)
+      ;; So it does not get loaded while outline-regexp is let-bound.
+      (require 'outline)
       ;; Activate `outline-mode'.  This runs `text-mode-hook' and
       ;; `outline-mode-hook'.  We must prevent that local processes
       ;; die.  Yes: I've seen `flyspell-mode', which starts "ispell".
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index da56fe70329..f0f67d01845 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2959,39 +2959,40 @@ not inside a defun."
             (type))
         (catch 'exit
           (while (python-nav-beginning-of-defun 1)
-            (when (and
-                   (or (not last-indent)
-                       (< (current-indentation) last-indent))
-                   (or
-                    (and first-run
+            (when (save-match-data
+                    (and
+                     (or (not last-indent)
+                         (< (current-indentation) last-indent))
+                     (or
+                      (and first-run
+                           (save-excursion
+                             ;; If this is the first run, we may add
+                             ;; the current defun at point.
+                             (setq first-run nil)
+                             (goto-char starting-pos)
+                             (python-nav-beginning-of-statement)
+                             (beginning-of-line 1)
+                             (looking-at-p
+                              python-nav-beginning-of-defun-regexp)))
+                      (< starting-pos
                          (save-excursion
-                           ;; If this is the first run, we may add
-                           ;; the current defun at point.
-                           (setq first-run nil)
-                           (goto-char starting-pos)
-                           (python-nav-beginning-of-statement)
-                           (beginning-of-line 1)
-                           (looking-at-p
-                            python-nav-beginning-of-defun-regexp)))
-                    (< starting-pos
-                       (save-excursion
-                         (let ((min-indent
-                                (+ (current-indentation)
-                                   python-indent-offset)))
-                           (if (< starting-indentation  min-indent)
-                               ;; If the starting indentation is not
-                               ;; within the min defun indent make the
-                               ;; check fail.
-                               starting-pos
-                             ;; Else go to the end of defun and add
-                             ;; up the current indentation to the
-                             ;; ending position.
-                             (python-nav-end-of-defun)
-                             (+ (point)
-                                (if (>= (current-indentation) min-indent)
-                                    (1+ (current-indentation))
-                                  0))))))))
-              (setq last-indent (current-indentation))
+                           (let ((min-indent
+                                  (+ (current-indentation)
+                                     python-indent-offset)))
+                             (if (< starting-indentation  min-indent)
+                                 ;; If the starting indentation is not
+                                 ;; within the min defun indent make the
+                                 ;; check fail.
+                                 starting-pos
+                               ;; Else go to the end of defun and add
+                               ;; up the current indentation to the
+                               ;; ending position.
+                               (python-nav-end-of-defun)
+                               (+ (point)
+                                  (if (>= (current-indentation) min-indent)
+                                      (1+ (current-indentation))
+                                    0)))))))))
+              (save-match-data (setq last-indent (current-indentation)))
               (if (or (not include-type) type)
                   (setq names (cons (match-string-no-properties 1) names))
                 (let ((match (split-string (match-string-no-properties 0))))