diff options
| author | Chris Feng <chris.w.feng@gmail.com> | 2015-08-17T09·50+0800 |
|---|---|---|
| committer | Chris Feng <chris.w.feng@gmail.com> | 2015-08-17T09·50+0800 |
| commit | 2d07429d0f2e77054b565926ac6c8b7f592f8a44 (patch) | |
| tree | fa109d1c0131b6d57020988a15725cf2769d87fa /exwm-workspace.el | |
| parent | 7120291197fb5ceb032671ba02345d181c77399d (diff) | |
| parent | 43b00d2f0fefd39ceddb62be792634aabc9e23ca (diff) | |
Merge branch 'move-window-fix' of https://github.com/pipcet/exwm into pipcet-move-window-fix
Diffstat (limited to 'exwm-workspace.el')
| -rw-r--r-- | exwm-workspace.el | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/exwm-workspace.el b/exwm-workspace.el index 09112d2d6556..7ac1fecb755f 100644 --- a/exwm-workspace.el +++ b/exwm-workspace.el @@ -168,12 +168,14 @@ The optional FORCE option is for internal use only." (unless id (setq id (exwm--buffer->id (window-buffer)))) (unless (and (<= 0 index) (< index exwm-workspace-number)) (user-error "[EXWM] Workspace index out of range: %d" index)) - (when (/= exwm-workspace-current-index index) + (with-current-buffer (exwm--id->buffer id) (let ((frame (elt exwm-workspace--list index))) - (with-current-buffer (exwm--id->buffer id) + (when (not (equal exwm--frame frame)) + (let ((name (replace-regexp-in-string "^\\s-*" "" (buffer-name)))) + (exwm-workspace-rename-buffer (if (= index exwm-workspace-current-index) + name + (concat " " name)))) (setq exwm--frame frame) - (exwm-workspace-rename-buffer - (concat " " (replace-regexp-in-string "^\\s-*" "" (buffer-name)))) (if exwm--floating-frame ;; Move the floating frame is enough (progn |