[elpa] externals/prefixed-core 468a251: * prefixed-core: Initial commit

[Stefan Monnier]

branch: externals/prefixed-core
commit 468a25168d465da305702db822167001620bcb7c
Author: Stefan Monnier 
Commit: Stefan Monnier 

* prefixed-core: Initial commit
---
 .gitignore   |   3 ++
 prefixed-core.el | 113 +++
 2 files changed, 116 insertions(+)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..c4af19a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*-autoloads.el
+*-pkg.el
+*.elc
diff --git a/prefixed-core.el b/prefixed-core.el
new file mode 100644
index 000..8ec8021
--- /dev/null
+++ b/prefixed-core.el
@@ -0,0 +1,113 @@
+;;; prefixed-core.el --- Rename core functions for a better structured 
namespace  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2020  Free Software Foundation, Inc.
+
+;; Author: Stefan Monnier 
+;; Keywords:
+;; Version: 0
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see .
+
+;;; Commentary:
+
+;; This library provids new names for old functions.
+;;
+;; Many core Lisp functions do not abide by the "package prefix convention"
+;; that Elisp packages are expected to follow, and instead use a naming
+;; that makes for names that sound closer to "plain English", typically
+;; using the form "VERB-NOUN" to focus on what the function does rather
+;; then what it operates on.
+;;
+;; In this library, we try to group functions based on their "subject"
+;; and make them share a commen prefix.
+;;
+;; While this may seem like a futile and impossible endeavor (many functions
+;; can arguably be reasonably placed in several different groups), I think it
+;; can be sufficiently useful, that it is worth trying to get a bit closer to
+;; this impossible goal.
+
+;; Some of the expected benefits are:
+;; - Making some functionality more discoverable
+;; - Helping to write code using prefix-based completion.
+;; - Better match he tradition followed in pretty much all programming
+;;   languages (including Elisp, for non-core functions).
+
+;;; Code:
+
+ Strings
+(defalias 'string-multibyte-p #'multibyte-string-p)
+(defalias 'string-split #'split-string)
+(defalias 'string-assoc #'assoc-string)
+(defalias 'string-clear #'clear-string)
+(defalias 'string-compare #'compare-strings)
+(defalias 'string-make #'make-string)
+(defalias 'string-subst-char #'subst-char-in-string)
+(defalias 'string-unibyte #'unibyte-string)
+(defalias 'string-truncate-to-width #'truncate-string-to-width)
+;; Other possibilities, which make sense but might be too verbose to be 
popular:
+(defalias 'string-downcase #'downcase)
+(defalias 'string-upcase #'upcase)
+(defalias 'string-format #'format)
+(defalias 'string-concat #'concat)
+
+ File names
+(defalias 'file-name-expand #'expand-file-name)
+(defalias 'file-name-abbreviate #'abbreviate-file-name)
+(defalias 'file-name-of-directory #'directory-file-name)
+(defalias 'file-name-substitute-envvars #'substitute-in-file-name)
+(defalias 'file-name-convert-standard #'convert-standard-filename)
+
+; File name handlers
+(defalias 'file-name-handler-find #'find-file-name-handler)
+(defvaralias 'file-name-handler-inhibit inhibit-file-name-handlers)
+(defvaralias 'file-name-handler-inhibit-operation inhibit-file-name-operation)
+
+ Files
+(defalias 'file-delete #'delete-file)
+(defalias 'file-copy #'copy-file)
+(defalias 'file-rename #'rename-file)
+(defalias 'file-add-new-name #'add-name-to-file)
+(defalias 'file-symlink #'make-symbolic-link)
+(defalias 'file-recode-name #'recode-file-name)
+(defalias 'file-insert-contents #'insert-file-contents)
+(defalias 'file-insert-contents-literally #'insert-file-contents-literally)
+
+ Regular expressions
+(defalias 're-match #'looking-at)
+(defalias 're-match-posix #'posix-looking-at)
+(defalias 're-match-back #'looking-back)
+(defalias 're-match-p #'looking-at-p)
+(defalias 're-search-string #'string-match) ;Should it be `re-string-search'?
+(defalias 're-search-string-posix #'posix-string-match)
+(defalias 're-search-string-p #'string-match-p)
+(defalias 're-replace-in-string #'replace-regexp-in-string)
+(defalias 're-search-forward-posix #'posix-search-forward)
+(defalias 're-search-backward-posix #'posix-search-backward)
+ Match data
+;; FIXME: We could either use the `match-' prefix for those (which
+;; minimizes changes), or put it under the `re-' prefix.
+;; (defalias 'match-replace #'replace-match)
+(defalias 're-match-data 

[elpa] branch externals/prefixed-core created (now 468a251)

[Stefan Monnier]

monnier pushed a change to branch externals/prefixed-core.

at  468a251   * prefixed-core: Initial commit

This branch includes the following new commits:

   new  468a251   * prefixed-core: Initial commit

[elpa] externals/relint 9eac0ae 4/5: Add tests for some uncovered rx warning cases

[Mattias Engdeg�rd]

branch: externals/relint
commit 9eac0ae7e122c520443992c058a4fdd7458402a8
Author: Mattias Engdegård 
Commit: Mattias Engdegård 

Add tests for some uncovered rx warning cases
---
 test/11.elisp| 7 ++-
 test/11.expected | 7 +++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/test/11.elisp b/test/11.elisp
index 8c48a39..d629a56 100644
--- a/test/11.elisp
+++ b/test/11.elisp
@@ -26,4 +26,9 @@
   ;; No error here.
   (rx (any "\000-\377" ?å) (any "\377" 255))
   ;; But here.
-  (rx (any "\000-\377" "\177" "\240")))
+  (rx (any "\000-\377" "\177" "\240"))
+
+  (rx (any "a-z" ?m))
+  (rx (any "a-f" "\000-\377"))
+  (rx (any "\240-\277" "\000-\377"))
+  )
diff --git a/test/11.expected b/test/11.expected
index bb0788f..2c0eb6b 100644
--- a/test/11.expected
+++ b/test/11.expected
@@ -52,3 +52,10 @@
 11.elisp:29:32: Character `\240' included in range `\200-\377' (pos 0)
   "\240"
^
+11.elisp:31:18: Character `m' included in range `a-z'
+11.elisp:32:19: Range `\000-\377' overlaps previous `a-f' (pos 0)
+  "\000-\377"
+   ^
+11.elisp:33:25: Range `\000-\377' overlaps previous `\240-\277' (pos 0)
+  "\000-\377"
+   ^

[elpa] externals/relint 762f3f8 3/5: Work around rx bug in Emacs 26

[Mattias Engdeg�rd]

branch: externals/relint
commit 762f3f8bd946c68ced3d5b6dc60dccf30ce0732e
Author: Mattias Engdegård 
Commit: Mattias Engdegård 

Work around rx bug in Emacs 26

Raw chars in string arguments to (any ...) forms weren't handled
correctly; use pairs with raw char values instead.
Found by Paul Pogonyshev (bug#9).
---
 relint.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/relint.el b/relint.el
index b946bf4..c90bcce 100644
--- a/relint.el
+++ b/relint.el
@@ -283,7 +283,8 @@ or nil if no position could be determined."
 
 (defun relint--escape-string (str escape-printable)
   (replace-regexp-in-string
-   (rx (any cntrl "\177-\377" ?\\ ?\"))
+   ;; Use pair notation for raw chars; "\200-\377" is buggy in Emacs 26.
+   (rx (any cntrl ?\177 (#x3fff80 . #x3f) ?\\ ?\"))
(lambda (s)
  (let ((c (logand (string-to-char s) #xff)))
(or (cdr (assq c '((?\b . "\\b")

[elpa] externals/relint a54960a 5/5: Increment version to 1.17

[Mattias Engdeg�rd]

branch: externals/relint
commit a54960a7059ff798a23383c87f123591a764c585
Author: Mattias Engdegård 
Commit: Mattias Engdegård 

Increment version to 1.17
---
 relint.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/relint.el b/relint.el
index c90bcce..8134671 100644
--- a/relint.el
+++ b/relint.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2019-2020 Free Software Foundation, Inc.
 
 ;; Author: Mattias Engdegård 
-;; Version: 1.16
+;; Version: 1.17
 ;; Package-Requires: ((xr "1.19") (emacs "26.1"))
 ;; URL: https://github.com/mattiase/relint
 ;; Keywords: lisp, regexps
@@ -29,6 +29,8 @@
 
 ;;; News:
 
+;; Version 1.17:
+;; - Fixed message display on Emacs 26
 ;; Version 1.16:
 ;; - Suppression comments now use regexp matching of messages
 ;; - New filename-specific checks in calls to `directory-files' etc

[elpa] externals/relint updated (a001a05 -> a54960a)

[Mattias Engdeg�rd]

mattiase pushed a change to branch externals/relint.

  from  a001a05   Increment version to 1.16
   new  0cbcadb   Add github auto-test infrastructure
   new  3cb19ed   Avoid byte-compilation warning in Emacs 26
   new  762f3f8   Work around rx bug in Emacs 26
   new  9eac0ae   Add tests for some uncovered rx warning cases
   new  a54960a   Increment version to 1.17


Summary of changes:
 .github/workflows/test.yml | 37 +
 Makefile   | 20 
 relint.el  | 11 ---
 test/11.elisp  |  7 ++-
 test/11.expected   |  7 +++
 5 files changed, 78 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/test.yml
 create mode 100644 Makefile

[elpa] externals/relint 0cbcadb 1/5: Add github auto-test infrastructure

[Mattias Engdeg�rd]

branch: externals/relint
commit 0cbcadba77d857d1e4f9a4fc4ef44a24176e3473
Author: Mattias Engdegård 
Commit: Mattias Engdegård 

Add github auto-test infrastructure

From a suggestion by Paul Pogonyshev (bug#9).
---
 .github/workflows/test.yml | 37 +
 Makefile   | 20 
 2 files changed, 57 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 000..3e23562
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,37 @@
+name: test
+
+on:
+  push:
+paths-ignore:
+  - '**README*'
+  pull_request:
+paths-ignore:
+  - '**README*'
+
+jobs:
+  test:
+runs-on: ubuntu-latest
+strategy:
+  matrix:
+emacs_version:
+  - "26.3"
+  - snapshot
+steps:
+  - name: Set up Emacs
+uses: purcell/setup-emacs@master
+with:
+  version: ${{matrix.emacs_version}}
+
+  - name: Check out relint
+uses: actions/checkout@v2
+with:
+  path: relint
+
+  - name: Check out xr
+uses: actions/checkout@v2
+with:
+  repository: mattiase/xr
+  path: xr
+
+  - name: Test
+run: make -C relint build check
diff --git a/Makefile b/Makefile
new file mode 100644
index 000..b143637
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,20 @@
+EMACS=emacs
+XRDIR=../xr
+EMFLAGS=-Q -batch -L . -L $(XRDIR)
+BYTECOMPFLAGS=--eval '(setq byte-compile-error-on-warn t)'
+
+EL=$(wildcard *.el)
+ELC=$(EL:.el=.elc)
+
+.PHONY: build check clean
+
+build: $(ELC)
+
+clean:
+   rm -f $(ELC)
+
+check:
+   $(EMACS) $(EMFLAGS) -l relint-test -f ert-run-tests-batch-and-exit
+
+%.elc: %.el
+   $(EMACS) $(EMFLAGS) $(BYTECOMPFLAGS) -f batch-byte-compile $^

[elpa] externals/relint 3cb19ed 2/5: Avoid byte-compilation warning in Emacs 26

[Mattias Engdeg�rd]

branch: externals/relint
commit 3cb19ed8966f5ab7a4577865def0ddba62d157e4
Author: Mattias Engdegård 
Commit: Mattias Engdegård 

Avoid byte-compilation warning in Emacs 26

string-to-multibyte was marked obsolete in Emacs 26 (but no longer is).
---
 relint.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/relint.el b/relint.el
index 0651d3b..b946bf4 100644
--- a/relint.el
+++ b/relint.el
@@ -1420,7 +1420,9 @@ than just to a surrounding or producing expression."
(push (cons arg arg) ranges))
 
   ((stringp arg)
-   (let* ((s (string-to-multibyte arg))
+   ;; `string-to-multibyte' was marked obsolete in Emacs 26,
+   ;; but no longer is.
+   (let* ((s (with-no-warnings (string-to-multibyte arg)))
   (j 0)
   (len (length s)))
  (while (< j len)

[elpa] externals/exwm c7c4258 2/8: Prevent jumping back to previous workspace

[Chris Feng]

branch: externals/exwm
commit c7c42582b7342f20c22b8a040eab72d3ce9f37b5
Author: Adrián Medraño Calvo 
Commit: Adrián Medraño Calvo 

Prevent jumping back to previous workspace

* exwm-workspace.el (exwm-workspace-switch): Focus out old frame
before switching to the new one to prevent jumping back to
previous workspace.
---
 exwm-workspace.el | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/exwm-workspace.el b/exwm-workspace.el
index f63a0a3..cff17f3 100644
--- a/exwm-workspace.el
+++ b/exwm-workspace.el
@@ -587,6 +587,11 @@ for internal use only."
 (when (or force (not (eq frame exwm-workspace--current)))
   (unless (window-live-p window)
 (setq window (frame-selected-window frame)))
+(when (and (not (eq frame old-frame))
+   (frame-live-p old-frame))
+  (with-selected-frame old-frame
+(funcall exwm-workspace--original-handle-focus-out
+ (list 'focus-out frame
   ;; Raise this frame.
   (xcb:+request exwm--connection
   (make-instance 'xcb:ConfigureWindow
@@ -680,11 +685,6 @@ for internal use only."
  :dst-x (/ (frame-pixel-width frame) 2)
  :dst-y (/ (frame-pixel-height frame) 2)))
   (xcb:flush exwm--connection
-(when (and (not (eq frame old-frame))
-   (frame-live-p old-frame))
-  (with-selected-frame old-frame
-(funcall exwm-workspace--original-handle-focus-out
- (list 'focus-out frame
 (funcall exwm-workspace--original-handle-focus-in (list 'focus-in frame))
 (run-hooks 'exwm-workspace-switch-hook)))
 

[elpa] externals/exwm ce2625d 1/8: Run hook upon input mode change

[Chris Feng]

branch: externals/exwm
commit ce2625d050b1a4aa5815dc40b85d0270d743
Author: Adrián Medraño Calvo 
Commit: Adrián Medraño Calvo 

Run hook upon input mode change

* exwm-input.el (exwm-input-input-mode-change-hook): Add new hook
for code to run upon input mode change.
(exwm-input--grab-keyboard, exwm-input--release-keyboard): Run it.
---
 exwm-input.el | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/exwm-input.el b/exwm-input.el
index 9ba3502..2d78407 100644
--- a/exwm-input.el
+++ b/exwm-input.el
@@ -145,6 +145,10 @@ This value should always be overwritten.")
 (defvar exwm-input--event-hook nil
   "Hook to run when EXWM receives an event.")
 
+(defvar exwm-input-input-mode-change-hook nil
+  "Hook to run when an input mode changes on an `exwm-mode' buffer.
+Current buffer will be the `exwm-mode' buffer when this hook runs.")
+
 (defvar exwm-workspace--current)
 (declare-function exwm-floating--do-moveresize "exwm-floating.el"
   (data _synthetic))
@@ -793,7 +797,8 @@ button event."
 (let ((buffer (exwm--id->buffer id)))
   (when buffer
 (with-current-buffer buffer
-  (setq exwm--input-mode 'line-mode))
+  (setq exwm--input-mode 'line-mode)
+  (run-hooks 'exwm-input-input-mode-change-hook))
 
 (defun exwm-input--release-keyboard ( id)
   "Ungrab all key events on window ID."
@@ -810,7 +815,8 @@ button event."
 (let ((buffer (exwm--id->buffer id)))
   (when buffer
 (with-current-buffer buffer
-  (setq exwm--input-mode 'char-mode))
+  (setq exwm--input-mode 'char-mode)
+  (run-hooks 'exwm-input-input-mode-change-hook))
 
 ;;;###autoload
 (defun exwm-input-grab-keyboard ( id)

[elpa] externals/exwm 624a302 8/8: Clarify the use of `exwm-config-default'

[Chris Feng]

branch: externals/exwm
commit 624a30212cca1af99fda1417fd81c31eeba4cca8
Author: Chris Feng 
Commit: Chris Feng 

Clarify the use of `exwm-config-default'

* exwm-config.el (exwm-config-example): Renamed from
`exwm-config-default' to make it clear it's just an example.
---
 exwm-config.el | 5 -
 exwm.el| 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/exwm-config.el b/exwm-config.el
index b47a9ba..bb8258a 100644
--- a/exwm-config.el
+++ b/exwm-config.el
@@ -28,7 +28,10 @@
 (require 'exwm)
 (require 'ido)
 
-(defun exwm-config-default ()
+(define-obsolete-function-alias 'exwm-config-default
+  #'exwm-config-example "27.1")
+
+(defun exwm-config-example ()
   "Default configuration of EXWM."
   ;; Set the initial workspace number.
   (unless (get 'exwm-workspace-number 'saved-value)
diff --git a/exwm.el b/exwm.el
index e94b283..98736ac 100644
--- a/exwm.el
+++ b/exwm.el
@@ -46,7 +46,7 @@
 ;;
 ;;(require 'exwm)
 ;;(require 'exwm-config)
-;;(exwm-config-default)
+;;(exwm-config-example)
 ;;
 ;; 3. Link or copy the file 'xinitrc' to '~/.xinitrc'.
 ;; 4. Launch EXWM in a console (e.g. tty1) with

[elpa] externals/exwm 7f4b9cd 7/8: Make return key work in exwm-xim

[Chris Feng]

branch: externals/exwm
commit 7f4b9cdb0f4122f561d26dcb39d405deeadf931e
Author: Chris Feng 
Commit: Chris Feng 

Make return key work in exwm-xim

* exwm-xim.el (exwm-xim--handle-forward-event-request): Send all key
events to Emacs while invoking an input method (don't rely on its
keymap definition).
---
 exwm-xim.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/exwm-xim.el b/exwm-xim.el
index 6a3b888..acf718e 100644
--- a/exwm-xim.el
+++ b/exwm-xim.el
@@ -586,7 +586,8 @@ The actual XIM request is in client message data or a 
property."
 (unwind-protect
 (with-temp-buffer
   ;; Always show key strokes.
-  (let ((input-method-use-echo-area t))
+  (let ((input-method-use-echo-area t)
+(exwm-input-line-mode-passthrough t))
 (setq result (funcall im-func event))
 ;; Clear echo area for the input method.
 (message nil)

[elpa] externals/exwm 921b0e3 6/8: Merge branch 'medranocalvo/upcase-menu-item' into externals/exwm

[Chris Feng]

branch: externals/exwm
commit 921b0e3efe11c29f433106f14b4ecb7e0ac71651
Merge: ab1d02a 1d0df91
Author: Chris Feng 
Commit: Chris Feng 

Merge branch 'medranocalvo/upcase-menu-item' into externals/exwm
---
 exwm-core.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exwm-core.el b/exwm-core.el
index 553fb4b..7645489 100644
--- a/exwm-core.el
+++ b/exwm-core.el
@@ -334,7 +334,7 @@ One of `line-mode' or `char-mode'.")
 ("Switch to" :filter
  (lambda ( _args)
(mapcar (lambda (i)
- `[,(format "workspace %d" i)
+ `[,(format "Workspace %d" i)
(lambda ()
  (interactive)
  (exwm-workspace-switch ,i))

[elpa] externals/exwm updated (21a7341 -> 624a302)

[Chris Feng]

ch11ng pushed a change to branch externals/exwm.

  from  21a7341   Merge branch 
'medranocalvo/abort-recursive-edit-on-workspace-switch' into externals/exwm
   new  ce2625d   Run hook upon input mode change
   new  c0931b5   Merge branch 'medranocalvo/input-mode-change-hook' into 
externals/exwm
   new  c7c4258   Prevent jumping back to previous workspace
   new  ab1d02a   Merge branch 'medranocalvo/prevent-jump-back-workspace' 
into externals/exwm
   new  1d0df91   ; Upcase menu item
   new  921b0e3   Merge branch 'medranocalvo/upcase-menu-item' into 
externals/exwm
   new  7f4b9cd   Make return key work in exwm-xim
   new  624a302   Clarify the use of `exwm-config-default'


Summary of changes:
 exwm-config.el|  5 -
 exwm-core.el  |  2 +-
 exwm-input.el | 10 --
 exwm-workspace.el | 10 +-
 exwm-xim.el   |  3 ++-
 exwm.el   |  2 +-
 6 files changed, 21 insertions(+), 11 deletions(-)

[elpa] externals/exwm c0931b5 4/8: Merge branch 'medranocalvo/input-mode-change-hook' into externals/exwm

[Chris Feng]

branch: externals/exwm
commit c0931b5c6604d8816bcee1e4dc2c13a262cb93eb
Merge: 21a7341 ce2625d
Author: Chris Feng 
Commit: Chris Feng 

Merge branch 'medranocalvo/input-mode-change-hook' into externals/exwm
---
 exwm-input.el | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/exwm-input.el b/exwm-input.el
index 9ba3502..2d78407 100644
--- a/exwm-input.el
+++ b/exwm-input.el
@@ -145,6 +145,10 @@ This value should always be overwritten.")
 (defvar exwm-input--event-hook nil
   "Hook to run when EXWM receives an event.")
 
+(defvar exwm-input-input-mode-change-hook nil
+  "Hook to run when an input mode changes on an `exwm-mode' buffer.
+Current buffer will be the `exwm-mode' buffer when this hook runs.")
+
 (defvar exwm-workspace--current)
 (declare-function exwm-floating--do-moveresize "exwm-floating.el"
   (data _synthetic))
@@ -793,7 +797,8 @@ button event."
 (let ((buffer (exwm--id->buffer id)))
   (when buffer
 (with-current-buffer buffer
-  (setq exwm--input-mode 'line-mode))
+  (setq exwm--input-mode 'line-mode)
+  (run-hooks 'exwm-input-input-mode-change-hook))
 
 (defun exwm-input--release-keyboard ( id)
   "Ungrab all key events on window ID."
@@ -810,7 +815,8 @@ button event."
 (let ((buffer (exwm--id->buffer id)))
   (when buffer
 (with-current-buffer buffer
-  (setq exwm--input-mode 'char-mode))
+  (setq exwm--input-mode 'char-mode)
+  (run-hooks 'exwm-input-input-mode-change-hook))
 
 ;;;###autoload
 (defun exwm-input-grab-keyboard ( id)

[elpa] externals/exwm 1d0df91 3/8: ; Upcase menu item

[Chris Feng]

branch: externals/exwm
commit 1d0df9144ef40b4d7dac5d73e5a4103e00343a6b
Author: Adrián Medraño Calvo 
Commit: Adrián Medraño Calvo 

; Upcase menu item
---
 exwm-core.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exwm-core.el b/exwm-core.el
index 553fb4b..7645489 100644
--- a/exwm-core.el
+++ b/exwm-core.el
@@ -334,7 +334,7 @@ One of `line-mode' or `char-mode'.")
 ("Switch to" :filter
  (lambda ( _args)
(mapcar (lambda (i)
- `[,(format "workspace %d" i)
+ `[,(format "Workspace %d" i)
(lambda ()
  (interactive)
  (exwm-workspace-switch ,i))

[elpa] externals/exwm ab1d02a 5/8: Merge branch 'medranocalvo/prevent-jump-back-workspace' into externals/exwm

[Chris Feng]

branch: externals/exwm
commit ab1d02af535b4af81dd66c02d3593506c80b5d60
Merge: c0931b5 c7c4258
Author: Chris Feng 
Commit: Chris Feng 

Merge branch 'medranocalvo/prevent-jump-back-workspace' into externals/exwm
---
 exwm-workspace.el | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/exwm-workspace.el b/exwm-workspace.el
index f63a0a3..cff17f3 100644
--- a/exwm-workspace.el
+++ b/exwm-workspace.el
@@ -587,6 +587,11 @@ for internal use only."
 (when (or force (not (eq frame exwm-workspace--current)))
   (unless (window-live-p window)
 (setq window (frame-selected-window frame)))
+(when (and (not (eq frame old-frame))
+   (frame-live-p old-frame))
+  (with-selected-frame old-frame
+(funcall exwm-workspace--original-handle-focus-out
+ (list 'focus-out frame
   ;; Raise this frame.
   (xcb:+request exwm--connection
   (make-instance 'xcb:ConfigureWindow
@@ -680,11 +685,6 @@ for internal use only."
  :dst-x (/ (frame-pixel-width frame) 2)
  :dst-y (/ (frame-pixel-height frame) 2)))
   (xcb:flush exwm--connection
-(when (and (not (eq frame old-frame))
-   (frame-live-p old-frame))
-  (with-selected-frame old-frame
-(funcall exwm-workspace--original-handle-focus-out
- (list 'focus-out frame
 (funcall exwm-workspace--original-handle-focus-in (list 'focus-in frame))
 (run-hooks 'exwm-workspace-switch-hook)))