Skip to content

Commit 7b654da

Browse files
committed
clean code
1 parent 87c9902 commit 7b654da

1 file changed

Lines changed: 6 additions & 16 deletions

File tree

src/workgroups2.el

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -644,10 +644,6 @@ If not - try to go to the parent dir and do the same."
644644
(h . wg-pickel-hash-table-link-deserializer))
645645
"Alist mapping type keys to link deserialization functions.")
646646

647-
648-
649-
;;; errors and predicates
650-
651647
(put 'wg-pickel-unpickelable-type-error
652648
'error-conditions
653649
'(error wg-pickel-errors wg-pickel-unpickelable-type-error))
@@ -777,14 +773,13 @@ If not - try to go to the parent dir and do the same."
777773
(gethash cons binds)
778774
(gethash (car cons) binds)
779775
(gethash (cdr cons) binds)))
776+
780777
(defun wg-pickel-cons-link-deserializer (cons-id car-id cdr-id binds)
781778
"Relink a cons cell with its car and cdr in BINDS."
782779
(let ((cons (gethash cons-id binds)))
783780
(setcar cons (gethash car-id binds))
784781
(setcdr cons (gethash cdr-id binds))))
785782

786-
787-
788783
;; vector - http://www.gnu.org/software/emacs/manual/html_node/elisp/Vector-Functions.html
789784
;; (wg-unpickel (wg-pickel (make-vector 9 'Z)))
790785
;;
@@ -2247,11 +2242,8 @@ Or scream unless NOERROR."
22472242
(run-hooks 'wg-after-switch-to-workgroup-hook))
22482243
(when current (pop wg-deactivation-list))))))
22492244

2250-
(defun wg-create-workgroup (name &optional blank)
2251-
"Create and add a workgroup named NAME.
2252-
Optional argument BLANK non-nil (set interactively with a prefix
2253-
arg) means use a blank, one window window-config. Otherwise use
2254-
the current window-configuration."
2245+
(defun wg-create-workgroup (name)
2246+
"Create and add a workgroup named NAME."
22552247
(interactive (list (wg-read-new-workgroup-name) current-prefix-arg))
22562248

22572249
(unless (file-exists-p (wg-get-session-file))
@@ -2265,7 +2257,7 @@ the current window-configuration."
22652257
(setf (wg-session-file-name session) wg-session-file)
22662258
(wg-reset-internal (wg-unpickel-session-parameters session))))
22672259

2268-
(wg-switch-to-workgroup-internal (wg-make-and-add-workgroup name blank))
2260+
(wg-switch-to-workgroup-internal (wg-make-and-add-workgroup name))
22692261

22702262
;; save the session file in real time
22712263
(wg-save-session)
@@ -2405,15 +2397,13 @@ Ask to overwrite if a workgroup with the same name exists."
24052397
(error "Cancelled"))))
24062398
(wg-add-workgroup workgroup))
24072399

2408-
(defun wg-make-and-add-workgroup (name &optional blank)
2400+
(defun wg-make-and-add-workgroup (name)
24092401
"Create a workgroup named NAME with current `window-tree'.
2410-
If BLANK - then just scratch buffer.
24112402
Add it with `wg-check-and-add-workgroup'."
24122403
(wg-check-and-add-workgroup
24132404
(wg-make-workgroup
24142405
:name name
2415-
:base-wconfig (if blank (wg-make-blank-wconfig)
2416-
(wg-current-wconfig)))))
2406+
:base-wconfig (wg-current-wconfig))))
24172407

24182408
(defun wg-get-workgroup-create (workgroup)
24192409
"Return the workgroup specified by WORKGROUP, creating a new one if needed.

0 commit comments

Comments
 (0)