workgroups2 Changeset - 3c1ee5858f98

Changeset - 3c1ee5858f98

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Sergey Pashinin - 11 years ago 2014-08-29 11:49:38
sergey@pashinin.com

Check some params are not nil

1 file changed with 6 insertions and 3 deletions:

src/workgroups2.el

0 comments (0 inline, 0 general)

src/workgroups2.el

➞

Show inline comments

 (defun wg-restore-buffer (buf &optional switch)
   "Restore BUF, return it and maybe SWITCH to it."
   (when buf
   (fset 'buffer-list wg-buffer-list-original)
   (prog1
       (or (wg-restore-existing-buffer buf switch)
           (wg-restore-file-buffer buf switch)
           (progn (wg-restore-default-buffer switch) nil))
     (if wg-mess-with-buffer-list
         (fset 'buffer-list wg-buffer-list-function))))
+        (fset 'buffer-list wg-buffer-list-function)))))
@@ @@ -3162,7 +3163,8 @@ This is only here for completeness." @@
 (defun wg-find-buf-by-uid (uid)
   "Find a buf in `wg-buf-list' by UID."
   (wg-find-bufobj-by-uid uid (wg-buf-list)))
   (when uid
     (wg-find-bufobj-by-uid uid (wg-buf-list))))
 (defun wg-set-buffer-uid-or-error (uid &optional buffer)
   "Set BUFFER's buffer local value of `wg-buffer-uid' to UID.
@@ @@ -3203,13 +3205,14 @@ See `wg-buffer-local-variables-alist' for details." @@
 If there isn't already a buf corresponding to BUFFER in
 `wg-buf-list', make one and add it.  Return BUFFER's uid
 in either case."
   (when buffer
   (with-current-buffer buffer
     (setq wg-buffer-uid
           (aif (wg-find-buffer-in-buf-list buffer (wg-buf-list))
               (wg-buf-uid it)
             (let ((buf (wg-buffer-to-buf buffer)))
               (push buf (wg-buf-list))
               (wg-buf-uid buf))))))
+              (wg-buf-uid buf)))))))
 (defun wg-buffer-uid-or-add (buffer)
   "Return BUFFER's uid.

0 comments (0 inline, 0 general)