merge from trunk

9 files changed, 112 insertions, 71 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ba3de9f4305..44a81ee32fc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,27 @@
+2013-09-15  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * progmodes/ruby-mode.el (ruby-operator-re): Consider line
+        continuation character an operator, as far as indentation is
+        concerned (Bug#15369).
+
+2013-09-15  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (window--state-put-2): Don't process buffer state
+        when buffer doesn't exist any more (Bug#15382).
+
+2013-09-15  Glenn Morris  <rgm@gnu.org>
+
+        * eshell/em-unix.el (eshell/rm):
+        Make -f ignore missing files.  (Bug#15373)
+
+        * eshell/esh-cmd.el (eshell--local-vars): New variable.  (Bug#15372)
+        (eshell-rewrite-for-command): Add for loop vars to eshell--local-vars.
+        * eshell/esh-var.el (eshell-get-variable): Respect eshell--local-vars.
+
+2013-09-14  Glenn Morris  <rgm@gnu.org>
+
+        * eshell/esh-var.el (eshell-variable-aliases-list): Fix doc typo.
+
 2013-09-13  Glenn Morris  <rgm@gnu.org>
 
         * dired-x.el (dired-guess-shell-alist-user): Doc fix.
diff --git a/lisp/dired.el b/lisp/dired.el
index 345e8d57113..27327352afb 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -4352,7 +4352,7 @@ instead.
 
 ;;;***
 
-;;;### (autoloads nil "dired-x" "dired-x.el" "11fd4a8afa32507cc32d4a04d852587f")
+;;;### (autoloads nil "dired-x" "dired-x.el" "732d08c173295dd14a0736fa222f532a")
 ;;; Generated autoloads from dired-x.el
 
 (autoload 'dired-jump "dired-x" "\
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 70cab5af319..2c10f7fef22 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-14  Vivek Dasmohapatra  <vivek@etla.org>
+
+        * erc.el (erc-update-mode-line-buffer):
+        Handle absent topic.  (Bug#15377)
+
 2013-09-13  Glenn Morris  <rgm@gnu.org>
 
         * erc-desktop-notifications.el (dbus-debug): Declare.
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 0bfd21d6c3a..771b7016bcd 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -6189,7 +6189,7 @@ if `erc-away' is non-nil."
                  ?m (erc-format-channel-modes)
                  ?n (or (erc-current-nick) "")
                  ?N (erc-format-network)
-                 ?o (erc-controls-strip erc-channel-topic)
+                 ?o (or (erc-controls-strip erc-channel-topic) "")
                  ?p (erc-port-to-string erc-session-port)
                  ?s (erc-format-target-and/or-server)
                  ?S (erc-format-target-and/or-network)
diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index 52d2b4d2a2d..5792fe17506 100644
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -284,18 +284,21 @@ Remove (unlink) the FILE(s).")
                                              entry)))))
            (eshell-funcalln 'unintern entry)))
         ((stringp entry)
-         (if (and (file-directory-p entry)
-                  (not (file-symlink-p entry)))
-             (if (or em-recursive
-                     eshell-rm-removes-directories)
-                 (if (or em-preview
-                         (not em-interactive)
-                         (y-or-n-p
-                          (format "rm: descend into directory `%s'? "
-                                  entry)))
+         ;; -f should silently ignore missing files (bug#15373).
+         (unless (and force-removal
+                      (not (file-exists-p entry)))
+           (if (and (file-directory-p entry)
+                    (not (file-symlink-p entry)))
+               (if (or em-recursive
+                       eshell-rm-removes-directories)
+                   (if (or em-preview
+                           (not em-interactive)
+                           (y-or-n-p
+                            (format "rm: descend into directory `%s'? "
+                                    entry)))
                      (eshell-remove-entries nil (list entry) t))
-               (eshell-error (format "rm: %s: is a directory\n" entry)))
-           (eshell-remove-entries nil (list entry) t)))))
+                 (eshell-error (format "rm: %s: is a directory\n" entry)))
+             (eshell-remove-entries nil (list entry) t))))))
      (setq args (cdr args)))
    nil))
 
diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el
index cc4fdd15bda..75e0e1d27c8 100644
--- a/lisp/eshell/esh-cmd.el
+++ b/lisp/eshell/esh-cmd.el
@@ -473,6 +473,8 @@ the second is ignored."
     arg))
 
 (defvar eshell-last-command-status)     ;Define in esh-io.el.
+(defvar eshell--local-vars nil
+  "List of locally bound vars that should take precedence over env-vars.")
 
 (defun eshell-rewrite-for-command (terms)
   "Rewrite a `for' command into its equivalent Eshell command form.
@@ -495,7 +497,9 @@ implemented via rewriting, rather than as a function."
                (eshell-command-body '(nil))
                (eshell-test-body '(nil)))
            (while (car for-items)
-             (let ((,(intern (cadr terms)) (car for-items)))
+             (let ((,(intern (cadr terms)) (car for-items))
+                   (eshell--local-vars (cons ',(intern (cadr terms))
+                                            eshell--local-vars)))
                (eshell-protect
                 ,(eshell-invokify-arg body t)))
              (setcar for-items (cadr for-items))
diff --git a/lisp/eshell/esh-var.el b/lisp/eshell/esh-var.el
index f68b65dfd46..3121dadace2 100644
--- a/lisp/eshell/esh-var.el
+++ b/lisp/eshell/esh-var.el
@@ -184,9 +184,9 @@ if they are quoted with a backslash."
                                    indices)))))
   "This list provides aliasing for variable references.
 It is very similar in concept to what `eshell-user-aliases-list' does
-for commands.  Each member of this defines defines the name of a
-command, and the Lisp value to return for that variable if it is
-accessed via the syntax '$NAME'.
+for commands.  Each member of this defines the name of a command,
+and the Lisp value to return for that variable if it is accessed
+via the syntax '$NAME'.
 
 If the value is a function, that function will be called with two
 arguments: the list of the indices that was used in the reference, and
@@ -502,6 +502,7 @@ Possible options are:
          (let ((sym (intern-soft var)))
            (if (and sym (boundp sym)
                     (or eshell-prefer-lisp-variables
+                        (memq sym eshell--local-vars) ; bug#15372
                         (not (getenv var))))
                (symbol-value sym)
              (getenv var))))
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 902616e3023..95206c15390 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -132,7 +132,7 @@ This should only be called after matching against `ruby-here-doc-beg-re'."
           ruby-block-end-re "\\|}\\|\\]\\)")
   "Regexp to match where the indentation gets shallower.")
 
-(defconst ruby-operator-re "[-,.+*/%&|^~=<>:]"
+(defconst ruby-operator-re "[-,.+*/%&|^~=<>:]\\|\\\\$"
   "Regexp to match operators.")
 
 (defconst ruby-symbol-chars "a-zA-Z0-9_"
diff --git a/lisp/window.el b/lisp/window.el
index a111b3cb5b4..14e9f6bc128 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -4464,62 +4464,66 @@ value can be also stored on disk and read back in a new session."
           (set-window-parameter window (car parameter) (cdr parameter))))
       ;; Process buffer related state.
       (when state
-        ;; We don't want to raise an error in case the buffer does not
-        ;; exist anymore, so we switch to a previous one and save the
-        ;; window with the intention of deleting it later if possible.
         (let ((buffer (get-buffer (car state))))
           (if buffer
-              (set-window-buffer window buffer)
+              (with-current-buffer buffer
+                (set-window-buffer window buffer)
+                (set-window-hscroll window (cdr (assq 'hscroll state)))
+                (apply 'set-window-fringes
+                       (cons window (cdr (assq 'fringes state))))
+                (let ((margins (cdr (assq 'margins state))))
+                  (set-window-margins window (car margins) (cdr margins)))
+                (let ((scroll-bars (cdr (assq 'scroll-bars state))))
+                  (set-window-scroll-bars
+                   window (car scroll-bars) (nth 2 scroll-bars)
+                   (nth 3 scroll-bars)))
+                (set-window-vscroll window (cdr (assq 'vscroll state)))
+                ;; Adjust vertically.
+                (if (memq window-size-fixed '(t height))
+                    ;; A fixed height window, try to restore the
+                    ;; original size.
+                    (let ((delta (- (cdr (assq 'total-height item))
+                                    (window-total-height window)))
+                          window-size-fixed)
+                      (when (window-resizable-p window delta)
+                        (window-resize window delta)))
+                  ;; Else check whether the window is not high enough.
+                  (let* ((min-size (window-min-size window nil ignore))
+                         (delta (- min-size (window-total-size window))))
+                    (when (and (> delta 0)
+                               (window-resizable-p window delta nil ignore))
+                      (window-resize window delta nil ignore))))
+                ;; Adjust horizontally.
+                (if (memq window-size-fixed '(t width))
+                    ;; A fixed width window, try to restore the original
+                    ;; size.
+                    (let ((delta (- (cdr (assq 'total-width item))
+                                    (window-total-width window)))
+                          window-size-fixed)
+                      (when (window-resizable-p window delta)
+                        (window-resize window delta)))
+                  ;; Else check whether the window is not wide enough.
+                  (let* ((min-size (window-min-size window t ignore))
+                         (delta (- min-size (window-total-size window t))))
+                    (when (and (> delta 0)
+                               (window-resizable-p window delta t ignore))
+                      (window-resize window delta t ignore))))
+                ;; Set dedicated status.
+                (set-window-dedicated-p window (cdr (assq 'dedicated state)))
+                ;; Install positions (maybe we should do this after all
+                ;; windows have been created and sized).
+                (ignore-errors
+                  (set-window-start window (cdr (assq 'start state)))
+                  (set-window-point window (cdr (assq 'point state))))
+                ;; Select window if it's the selected one.
+                (when (cdr (assq 'selected state))
+                  (select-window window)))
+            ;; We don't want to raise an error in case the buffer does
+            ;; not exist anymore, so we switch to a previous one and
+            ;; save the window with the intention of deleting it later
+            ;; if possible.
             (switch-to-prev-buffer window)
-            (push window window-state-put-stale-windows)))
-        (with-current-buffer (window-buffer window)
-          (set-window-hscroll window (cdr (assq 'hscroll state)))
-          (apply 'set-window-fringes
-                 (cons window (cdr (assq 'fringes state))))
-          (let ((margins (cdr (assq 'margins state))))
-            (set-window-margins window (car margins) (cdr margins)))
-          (let ((scroll-bars (cdr (assq 'scroll-bars state))))
-            (set-window-scroll-bars
-             window (car scroll-bars) (nth 2 scroll-bars) (nth 3 scroll-bars)))
-          (set-window-vscroll window (cdr (assq 'vscroll state)))
-          ;; Adjust vertically.
-          (if (memq window-size-fixed '(t height))
-              ;; A fixed height window, try to restore the original size.
-              (let ((delta (- (cdr (assq 'total-height item))
-                              (window-total-height window)))
-                    window-size-fixed)
-                (when (window-resizable-p window delta)
-                  (window-resize window delta)))
-            ;; Else check whether the window is not high enough.
-            (let* ((min-size (window-min-size window nil ignore))
-                   (delta (- min-size (window-total-size window))))
-              (when (and (> delta 0)
-                         (window-resizable-p window delta nil ignore))
-                (window-resize window delta nil ignore))))
-          ;; Adjust horizontally.
-          (if (memq window-size-fixed '(t width))
-              ;; A fixed width window, try to restore the original size.
-              (let ((delta (- (cdr (assq 'total-width item))
-                              (window-total-width window)))
-                    window-size-fixed)
-                (when (window-resizable-p window delta)
-                  (window-resize window delta)))
-            ;; Else check whether the window is not wide enough.
-            (let* ((min-size (window-min-size window t ignore))
-                   (delta (- min-size (window-total-size window t))))
-              (when (and (> delta 0)
-                         (window-resizable-p window delta t ignore))
-                (window-resize window delta t ignore))))
-          ;; Set dedicated status.
-          (set-window-dedicated-p window (cdr (assq 'dedicated state)))
-          ;; Install positions (maybe we should do this after all windows
-          ;; have been created and sized).
-          (ignore-errors
-            (set-window-start window (cdr (assq 'start state)))
-            (set-window-point window (cdr (assq 'point state))))
-          ;; Select window if it's the selected one.
-          (when (cdr (assq 'selected state))
-            (select-window window)))))))
+            (push window window-state-put-stale-windows)))))))
 
 (defun window-state-put (state &optional window ignore)
   "Put window state STATE into WINDOW.