[elpa] master dae475f 2/2: Merge commit '8e63abd47ea0cfa00b44b3c2ab81a933dbd9ce93'
branch: master commit dae475fc65c7aeb7ea6fa96353ffcfeec79b2201 Merge: 917b79e 8e63abd Author: Ian DunnCommit: Ian Dunn Merge commit '8e63abd47ea0cfa00b44b3c2ab81a933dbd9ce93' --- packages/enwc/enwc.el | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/enwc/enwc.el b/packages/enwc/enwc.el index 4728e93..7315092 100644 --- a/packages/enwc/enwc.el +++ b/packages/enwc/enwc.el @@ -35,11 +35,16 @@ ;; ;; In order to use this package, add ;; -;; (setq enwc-default-backend 'backend-symbol) +;; (setq enwc-default-backend BACKEND-SYMBOL) ;; -;; to your .emacs file (or other init file). +;; where BACKEND-SYMBOL is either 'wicd or 'nm, to your .emacs file (or other init +;; file). ;; ;; Then you can just run `enwc' to start everything. +;; +;; Example: +;; +;; (setq enwc-default-backend 'nm) ;;; TODO: ;;
[elpa] master 8e63abd 1/2: Clarified example in enwc.el
branch: master commit 8e63abd47ea0cfa00b44b3c2ab81a933dbd9ce93 Author: Ian DunnCommit: Ian Dunn Clarified example in enwc.el * enwc.el: Added example config and explained backend symbols --- enwc.el | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/enwc.el b/enwc.el index 4728e93..7315092 100644 --- a/enwc.el +++ b/enwc.el @@ -35,11 +35,16 @@ ;; ;; In order to use this package, add ;; -;; (setq enwc-default-backend 'backend-symbol) +;; (setq enwc-default-backend BACKEND-SYMBOL) ;; -;; to your .emacs file (or other init file). +;; where BACKEND-SYMBOL is either 'wicd or 'nm, to your .emacs file (or other init +;; file). ;; ;; Then you can just run `enwc' to start everything. +;; +;; Example: +;; +;; (setq enwc-default-backend 'nm) ;;; TODO: ;;
[elpa] externals/rudel c4a0455: * rudel-transport-util.el (cl-no-applicable-method): Rename
branch: externals/rudel commit c4a0455a465ff822773a847536f634da942e2ec9 Author: Stefan MonnierCommit: Stefan Monnier * rudel-transport-util.el (cl-no-applicable-method): Rename Rename method from no-applicable-method and adjust calling convention accordingly. --- rudel-transport-util.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rudel-transport-util.el b/rudel-transport-util.el index cc105ea..86948f5 100644 --- a/rudel-transport-util.el +++ b/rudel-transport-util.el @@ -117,8 +117,8 @@ transform a bidirectional data stream as it passes through them." (set-slot-value (oref this :transport) slot-name new-value))) ) -(cl-defmethod no-applicable-method ((this rudel-transport-filter) -method args) +(cl-defmethod cl-no-applicable-method (method + (this rudel-transport-filter) args) "Make methods of underlying transport callable as virtual methods of THIS." (apply method (oref this :transport) (cdr args)))
[elpa] externals/exwm f299ca5 2/4: Fix systemtray position
branch: externals/exwm commit f299ca5ed7056842aa59e9978061bca650316a71 Author: Chris FengCommit: Chris Feng Fix systemtray position * exwm-workspace.el (exwm-workspace--update-workareas-hook): New hook run when workareas get updated. (exwm-workspace--update-workareas): Run the hook. * exwm-systemtray.el (exwm-systemtray--on-workspace-switch) (exwm-systemtray--on-randr-refresh): Take struts into account when calculating the position for systemtray. (exwm-systemtray--on-struts-update): Alias of `exwm-systemtray--on-randr-refresh'. (exwm-systemtray--init, exwm-systemtray--exit): Manipulate `exwm-workspace--update-workareas-hook'. --- exwm-systemtray.el | 18 -- exwm-workspace.el | 5 - 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/exwm-systemtray.el b/exwm-systemtray.el index 60a2e3b..82a2ccd 100644 --- a/exwm-systemtray.el +++ b/exwm-systemtray.el @@ -304,6 +304,9 @@ You shall use the default value if using auto-hide minibuffer.") :event (xcb:marshal obj exwm-systemtray--connection (xcb:flush exwm-systemtray--connection)) +(defvar exwm-workspace--workareas) +(defvar exwm-workspace-current-index) + (defun exwm-systemtray--on-workspace-switch () "Reparent/Refresh the system tray in `exwm-workspace-switch-hook'." (unless (exwm-workspace--minibuffer-own-frame-p) @@ -314,7 +317,9 @@ You shall use the default value if using auto-hide minibuffer.") (frame-parameter exwm-workspace--current 'window-id)) :x 0 - :y (- (exwm-workspace--current-height) + :y (- (elt (elt exwm-workspace--workareas + exwm-workspace-current-index) + 3) exwm-systemtray-height (exwm-systemtray--refresh)) @@ -325,10 +330,15 @@ You shall use the default value if using auto-hide minibuffer.") (make-instance 'xcb:ConfigureWindow :window exwm-systemtray--embedder :value-mask xcb:ConfigWindow:Y - :y (- (exwm-workspace--current-height) + :y (- (elt (elt exwm-workspace--workareas + exwm-workspace-current-index) + 3) exwm-systemtray-height (exwm-systemtray--refresh)) +(defalias 'exwm-systemtray--on-struts-update + #'exwm-systemtray--on-randr-refresh) + (defvar xcb:Atom:_NET_SYSTEM_TRAY_S0) (defvar exwm-workspace--minibuffer) @@ -459,6 +469,8 @@ You shall use the default value if using auto-hide minibuffer.") #'exwm-systemtray--on-KeyPress)) ;; Add hook to move/reparent the embedder. (add-hook 'exwm-workspace-switch-hook #'exwm-systemtray--on-workspace-switch) + (add-hook 'exwm-workspace--update-workareas-hook +#'exwm-systemtray--on-struts-update) (when (boundp 'exwm-randr-refresh-hook) (add-hook 'exwm-randr-refresh-hook #'exwm-systemtray--on-randr-refresh))) @@ -472,6 +484,8 @@ You shall use the default value if using auto-hide minibuffer.") exwm-systemtray--embedder nil) (remove-hook 'exwm-workspace-switch-hook #'exwm-systemtray--on-workspace-switch) +(remove-hook 'exwm-workspace--update-workareas-hook + #'exwm-systemtray--on-struts-update) (when (boundp 'exwm-randr-refresh-hook) (remove-hook 'exwm-randr-refresh-hook #'exwm-systemtray--on-randr-refresh diff --git a/exwm-workspace.el b/exwm-workspace.el index 17aa2c0..6686598 100644 --- a/exwm-workspace.el +++ b/exwm-workspace.el @@ -247,6 +247,8 @@ Value nil means to use the default position which is fixed at bottom, while (append exwm-workspace--struts (list struts*)) (defvar exwm-workspace--workareas nil "Workareas (struts excluded).") +(defvar exwm-workspace--update-workareas-hook nil + "Normal hook run when workareas get updated.") (defun exwm-workspace--update-workareas () "Update `exwm-workspace--workareas'." @@ -309,7 +311,8 @@ Value nil means to use the default position which is fixed at bottom, while (cl-incf (aref w 3) delta)) ;; Save the result. (setq exwm-workspace--workareas workareas) -(xcb:flush exwm--connection))) +(xcb:flush exwm--connection)) + (run-hooks 'exwm-workspace--update-workareas-hook)) (defvar exwm-workspace--fullscreen-frame-count 0 "Count the fullscreen workspace frames.")
[elpa] externals/exwm b79a3c5 4/4: Merge branch 'Stebalien/expose-line-mode-passthrough' into externals/exwm
branch: externals/exwm commit b79a3c52a5ebd2a663e47fe6d473400cf38bdcf4 Merge: f299ca5 d0e9895 Author: Chris FengCommit: Chris Feng Merge branch 'Stebalien/expose-line-mode-passthrough' into externals/exwm --- exwm-core.el | 4 ++-- exwm-input.el | 23 +++ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/exwm-core.el b/exwm-core.el index c5f28cb..750f134 100644 --- a/exwm-core.el +++ b/exwm-core.el @@ -80,7 +80,7 @@ (logior xcb:EventMask:StructureNotify xcb:EventMask:PropertyChange)) "Event mask set on all managed windows.") -(defvar exwm-input--line-mode-passthrough) +(defvar exwm-input-line-mode-passthrough) (defvar exwm-input--global-prefix-keys) (defvar exwm-input-prefix-keys) (defvar exwm-input--simulation-prefix-keys) @@ -154,7 +154,7 @@ (lambda () (interactive) (cond - ((or exwm-input--line-mode-passthrough + ((or exwm-input-line-mode-passthrough ;; Do not test `exwm-input--during-command'. (active-minibuffer-window) (memq last-input-event exwm-input--global-prefix-keys) diff --git a/exwm-input.el b/exwm-input.el index d410bec..809f41e 100644 --- a/exwm-input.el +++ b/exwm-input.el @@ -420,7 +420,7 @@ This value should always be overwritten.") (defvar exwm-input--during-command nil "Indicate whether between `pre-command-hook' and `post-command-hook'.") -(defvar exwm-input--line-mode-passthrough nil +(defvar exwm-input-line-mode-passthrough nil "Non-nil makes 'line-mode' forwards all events to Emacs.") (defvar exwm-input--line-mode-cache nil "Cache for incomplete key sequence.") @@ -449,7 +449,7 @@ This value should always be overwritten.") (setq event (xcb:keysyms:keysym->event exwm--connection (car keysym) (logand state (lognot (cdr keysym) - (or exwm-input--line-mode-passthrough + (or exwm-input-line-mode-passthrough exwm-input--during-command ;; Forward the event when there is an incomplete key ;; sequence or when the minibuffer is active. @@ -629,16 +629,15 @@ This value should always be overwritten.") (let (key keys) (dotimes (i times) ;; Skip events not from keyboard - (setq exwm-input--line-mode-passthrough t) - (catch 'break -(while t - (setq key (read-key (format "Send key: %s (%d/%d)" - (key-description keys) - (1+ i) times))) - (when (and (listp key) (eq (car key) t)) -(setq key (cdr key))) - (unless (listp key) (throw 'break nil - (setq exwm-input--line-mode-passthrough nil) + (let ((exwm-input-line-mode-passthrough t)) +(catch 'break + (while t +(setq key (read-key (format "Send key: %s (%d/%d)" +(key-description keys) +(1+ i) times))) +(when (and (listp key) (eq (car key) t)) + (setq key (cdr key))) +(unless (listp key) (throw 'break nil) (setq keys (vconcat keys (vector key))) (exwm-input--fake-key key
[elpa] externals/exwm 46e1d7a 1/4: Use let instead of setq when setting exwm-input--line-mode-passthrough
branch: externals/exwm commit 46e1d7a754bdf66cf89e6d3fad3d1c4bf003db3a Author: Steven AllenCommit: Steven Allen Use let instead of setq when setting exwm-input--line-mode-passthrough That way, exwm won't clobber user modifications to this variable. --- exwm-input.el | 19 +-- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/exwm-input.el b/exwm-input.el index d410bec..22e21d6 100644 --- a/exwm-input.el +++ b/exwm-input.el @@ -629,16 +629,15 @@ This value should always be overwritten.") (let (key keys) (dotimes (i times) ;; Skip events not from keyboard - (setq exwm-input--line-mode-passthrough t) - (catch 'break -(while t - (setq key (read-key (format "Send key: %s (%d/%d)" - (key-description keys) - (1+ i) times))) - (when (and (listp key) (eq (car key) t)) -(setq key (cdr key))) - (unless (listp key) (throw 'break nil - (setq exwm-input--line-mode-passthrough nil) + (let ((exwm-input--line-mode-passthrough t)) +(catch 'break + (while t +(setq key (read-key (format "Send key: %s (%d/%d)" +(key-description keys) +(1+ i) times))) +(when (and (listp key) (eq (car key) t)) + (setq key (cdr key))) +(unless (listp key) (throw 'break nil) (setq keys (vconcat keys (vector key))) (exwm-input--fake-key key
[elpa] externals/exwm d0e9895 3/4: ; Expose `exwm-input-line-mode-passthrough' as a public interface.
branch: externals/exwm commit d0e98957485afa6a91d3c8be1520d65e46987718 Author: Chris FengCommit: Chris Feng ; Expose `exwm-input-line-mode-passthrough' as a public interface. --- exwm-core.el | 4 ++-- exwm-input.el | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/exwm-core.el b/exwm-core.el index c5f28cb..750f134 100644 --- a/exwm-core.el +++ b/exwm-core.el @@ -80,7 +80,7 @@ (logior xcb:EventMask:StructureNotify xcb:EventMask:PropertyChange)) "Event mask set on all managed windows.") -(defvar exwm-input--line-mode-passthrough) +(defvar exwm-input-line-mode-passthrough) (defvar exwm-input--global-prefix-keys) (defvar exwm-input-prefix-keys) (defvar exwm-input--simulation-prefix-keys) @@ -154,7 +154,7 @@ (lambda () (interactive) (cond - ((or exwm-input--line-mode-passthrough + ((or exwm-input-line-mode-passthrough ;; Do not test `exwm-input--during-command'. (active-minibuffer-window) (memq last-input-event exwm-input--global-prefix-keys) diff --git a/exwm-input.el b/exwm-input.el index 22e21d6..809f41e 100644 --- a/exwm-input.el +++ b/exwm-input.el @@ -420,7 +420,7 @@ This value should always be overwritten.") (defvar exwm-input--during-command nil "Indicate whether between `pre-command-hook' and `post-command-hook'.") -(defvar exwm-input--line-mode-passthrough nil +(defvar exwm-input-line-mode-passthrough nil "Non-nil makes 'line-mode' forwards all events to Emacs.") (defvar exwm-input--line-mode-cache nil "Cache for incomplete key sequence.") @@ -449,7 +449,7 @@ This value should always be overwritten.") (setq event (xcb:keysyms:keysym->event exwm--connection (car keysym) (logand state (lognot (cdr keysym) - (or exwm-input--line-mode-passthrough + (or exwm-input-line-mode-passthrough exwm-input--during-command ;; Forward the event when there is an incomplete key ;; sequence or when the minibuffer is active. @@ -629,7 +629,7 @@ This value should always be overwritten.") (let (key keys) (dotimes (i times) ;; Skip events not from keyboard - (let ((exwm-input--line-mode-passthrough t)) + (let ((exwm-input-line-mode-passthrough t)) (catch 'break (while t (setq key (read-key (format "Send key: %s (%d/%d)"
[elpa] externals/exwm updated (0ae1e73 -> b79a3c5)
ch11ng pushed a change to branch externals/exwm. from 0ae1e73 Bump version to 0.13 new f299ca5 Fix systemtray position new 46e1d7a Use let instead of setq when setting exwm-input--line-mode-passthrough new d0e9895 ; Expose `exwm-input-line-mode-passthrough' as a public interface. new b79a3c5 Merge branch 'Stebalien/expose-line-mode-passthrough' into externals/exwm Summary of changes: exwm-core.el | 4 ++-- exwm-input.el | 23 +++ exwm-systemtray.el | 18 -- exwm-workspace.el | 5 - 4 files changed, 33 insertions(+), 17 deletions(-)
[elpa] master 917b79e: Minor fix against b30add.
branch: master commit 917b79e9e2b22f5000a2d0d67ffa54ba4fcd1b69 Author: BastienCommit: Bastien Minor fix against b30add. Use b...@gnu.org instead of b...@altern.org. --- packages/windresize/windresize.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/windresize/windresize.el b/packages/windresize/windresize.el index f5a060a..c87735d 100644 --- a/packages/windresize/windresize.el +++ b/packages/windresize/windresize.el @@ -3,8 +3,8 @@ ;; Copyright (C) 2011-2017 Free Software Foundation, Inc. ;; ;; Filename: windresize.el -;; Author: Bastien -;; Maintainer: Bastien +;; Author: Bastien +;; Maintainer: Bastien ;; Keywords: window ;; Description: Set window configuration with keystrokes ;; Version: 0.1