From 5f5ffd177fa256dc22ac48e977762034da2d7ae1 2014-08-23 09:52:13 From: Sergey Pashinin Date: 2014-08-23 09:52:13 Subject: [PATCH] Removed wg-switch-to-first-workgroup-on-find-session-file --- diff --git a/src/workgroups-session.el b/src/workgroups-session.el index dcfe510433a5f236d87186f0508c8d4fc2729edb..28960406af223669cfb4788c83e89b38ec1e343f 100644 --- a/src/workgroups-session.el +++ b/src/workgroups-session.el @@ -71,8 +71,11 @@ nil otherwise." (error "%S is not a Workgroups session file." filename)) (setf (wg-session-file-name session) filename) (wg-reset-internal (wg-unpickel-session-parameters session))) - (wg-awhen (and wg-switch-to-first-workgroup-on-find-session-file - (wg-workgroup-list)) + + (if wg-control-frames + (wg-restore-frames)) + + (wg-awhen (wg-workgroup-list) (if (and wg-open-this-wg (member wg-open-this-wg (wg-workgroup-names))) (wg-switch-to-workgroup wg-open-this-wg) @@ -83,8 +86,6 @@ nil otherwise." (wg-session-parameter (wg-current-session t) 'last-workgroup)) (wg-switch-to-workgroup (car it))) )) - (if wg-control-frames - (wg-restore-frames)) (wg-fontified-message (:cmd "Loaded: ") (:file filename))) (t (wg-query-and-save-if-modified) diff --git a/src/workgroups-variables.el b/src/workgroups-variables.el index d67c38618f6e525ac5f2ba3faaf573a7ba7dd32b..875329aad3b06f60272a7ecf173cb088f7fff25c 100644 --- a/src/workgroups-variables.el +++ b/src/workgroups-variables.el @@ -76,14 +76,6 @@ If nil - nothing happens." :type 'string :group 'workgroups) -(defcustom wg-switch-to-first-workgroup-on-find-session-file t - "Non-nil means switch to the first workgroup in a session file -when it's found with `wg-find-session-file'." - :type 'boolean - :group 'workgroups) - - - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;