diff -Nru emacs-which-key-3.3.0/debian/changelog emacs-which-key-3.3.1/debian/changelog --- emacs-which-key-3.3.0/debian/changelog 2018-07-09 16:57:57.000000000 +0000 +++ emacs-which-key-3.3.1/debian/changelog 2018-11-15 05:45:12.000000000 +0000 @@ -1,3 +1,11 @@ +emacs-which-key (3.3.1-1) unstable; urgency=medium + + * New upstream version 3.3.1 + * Refresh patch + * d/control: Declare Standards-Version 4.2.1 (no changes needed) + + -- Lev Lamberov Thu, 15 Nov 2018 10:45:12 +0500 + emacs-which-key (3.3.0-1) unstable; urgency=medium * New upstream version 3.3.0 diff -Nru emacs-which-key-3.3.0/debian/control emacs-which-key-3.3.1/debian/control --- emacs-which-key-3.3.0/debian/control 2018-07-09 16:57:57.000000000 +0000 +++ emacs-which-key-3.3.1/debian/control 2018-11-15 05:45:12.000000000 +0000 @@ -5,7 +5,7 @@ Uploaders: Lev Lamberov Build-Depends: debhelper (>= 11), dh-elpa -Standards-Version: 4.1.5 +Standards-Version: 4.2.1 Rules-Requires-Root: no Testsuite: autopkgtest-pkg-elpa Homepage: https://github.com/justbur/emacs-which-key diff -Nru emacs-which-key-3.3.0/debian/patches/0001-fix-documentation.diff emacs-which-key-3.3.1/debian/patches/0001-fix-documentation.diff --- emacs-which-key-3.3.0/debian/patches/0001-fix-documentation.diff 2018-07-09 16:57:57.000000000 +0000 +++ emacs-which-key-3.3.1/debian/patches/0001-fix-documentation.diff 2018-11-15 05:45:12.000000000 +0000 @@ -25,7 +25,7 @@ ** Table of Contents :TOC_3: - [[#which-key][which-key]] - [[#recent-changes][Recent Changes]] -@@ -56,7 +55,7 @@ +@@ -57,7 +56,7 @@ After setting up [[http://melpa.org][MELPA]] as a repository, use =M-x package-install which-key= or your preferred method. You will need to call =which-key-mode= to enable the minor mode of course. @@ -34,7 +34,7 @@ *** Manually Add which-key.el to your =load-path= and require. Something like #+BEGIN_SRC emacs-lisp -@@ -64,71 +63,65 @@ +@@ -65,71 +64,65 @@ (require 'which-key) (which-key-mode) #+END_SRC @@ -120,7 +120,7 @@ ** Additional Commands - =which-key-show-top-level= will show most key bindings without a prefix. It is most and not all, because many are probably not interesting to most -@@ -139,7 +132,7 @@ +@@ -140,7 +133,7 @@ - =which-key-show-next-page= is the command used for paging. - =which-key-undo= can be used to undo the last keypress when in the middle of a key sequence. @@ -129,7 +129,7 @@ ** Special Features and Configuration Options There are more options than the ones described here. All of the configurable variables are available through =M-x customize-group which-key=. -@@ -158,24 +151,24 @@ +@@ -159,24 +152,24 @@ #+END_SRC Show keys in a side window. This popup type has further options: #+BEGIN_SRC emacs-lisp @@ -158,7 +158,7 @@ #+BEGIN_SRC emacs-lisp (setq which-key-popup-type 'frame) #+END_SRC -@@ -185,11 +178,11 @@ +@@ -186,11 +179,11 @@ #+BEGIN_SRC emacs-lisp ;; max width of which-key frame: number of columns (an integer) (setq which-key-frame-max-width 60) @@ -172,7 +172,7 @@ **** custom Write your own display functions! This requires you to write three functions, =which-key-custom-popup-max-dimensions-function=, -@@ -197,8 +190,8 @@ +@@ -198,8 +191,8 @@ =which-key-custom-hide-popup-function=. Refer to the documentation for those variables for more information, but here is a working example (this is the current implementation of side-window bottom). @@ -183,7 +183,7 @@ #+BEGIN_SRC emacs-lisp (setq which-key-popup-type 'custom) (defun which-key-custom-popup-max-dimensions-function (ignore) -@@ -220,14 +213,14 @@ +@@ -221,14 +214,14 @@ (when (buffer-live-p which-key--buffer) (quit-windows-on which-key--buffer))) #+END_SRC @@ -200,7 +200,7 @@ **** Automatic A newer option is to set =which-key-enable-extended-define-key= which advises =define-key= to allow which-key to pre-process its arguments. The -@@ -249,70 +242,70 @@ +@@ -250,70 +243,70 @@ **** "Key-Based" replacement Using this method, the description of a key is replaced using a string that you provide. Here's an example @@ -286,7 +286,7 @@ (lambda (kb) (cons (car kb) (if paredit-mode -@@ -320,19 +313,19 @@ +@@ -321,19 +314,19 @@ "[ ] paredit-mode")))) which-key-replacement-alist) #+END_SRC @@ -312,7 +312,7 @@ #+BEGIN_SRC emacs-lisp ;; default (setq which-key-sort-order 'which-key-key-order) -@@ -345,9 +338,9 @@ +@@ -346,9 +339,9 @@ ;; sort based on the key description ignoring case ;; (setq which-key-sort-order 'which-key-description-order) #+END_SRC @@ -324,7 +324,7 @@ There are at least several prefixes that have many keys bound to them, like =C-x=. which-key displays as many keys as it can given your settings, but for these prefixes this may not be enough. The paging feature gives you the -@@ -355,7 +348,7 @@ +@@ -356,7 +349,7 @@ allow you to cycle through the pages without changing the key sequence you were in the middle of typing. There are two slightly different ways of doing this. @@ -333,7 +333,7 @@ **** Method 1 (default): Using C-h (or =help-char=) This is the easiest way, and is turned on by default. Use #+BEGIN_SRC emacs-lisp -@@ -369,38 +362,38 @@ +@@ -370,38 +363,38 @@ get a list of commands that follow =C-x=. This uses which-key instead to show those keys, and unlike the Emacs default saves the incomplete prefix that you just entered so that the next keystroke can complete the command. @@ -383,7 +383,7 @@ *** Face Customization Options The faces that which-key uses are | Face | Applied To | Default Definition | -@@ -412,32 +405,32 @@ +@@ -413,32 +406,32 @@ | =which-key-group-description-face= | Command groups (i.e, keymaps) | =:inherit font-lock-keyword-face= | | =which-key-command-description-face= | Commands not in local-map | =:inherit font-lock-function-name-face= | | =which-key-local-map-description-face= | Commands in local-map | =:inherit which-key-command-description-face= | @@ -423,7 +423,7 @@ #+BEGIN_SRC emacs-lisp ;; Set the time delay (in seconds) for the which-key popup to appear. A value of ;; zero might cause issues so a non-zero value is recommended. -@@ -494,7 +487,7 @@ +@@ -495,7 +488,7 @@ before which-key and through =which-key-show-operator-state-maps= which needs to be enabled explicitly because it is more of a hack. The former allows for the inner and outer text object maps to show, while the latter @@ -432,7 +432,7 @@ *** God-mode Call =(which-key-enable-god-mode-support)= after loading god-mode to enable support for god-mode key sequences. This is new and experimental, so please -@@ -503,12 +496,7 @@ +@@ -504,11 +497,6 @@ *** Nice Display with Split Frame Unlike guide-key, which-key looks good even if the frame is split into several windows. @@ -441,8 +441,6 @@ - - #+CAPTION: which-key in a frame with 2 vertical splits - [[./img/which-key-bottom-split.png]] -- -+ - ** Thanks - Special thanks to - - [[https://github.com/bmag][@bmag]] for helping with the initial development and finding many bugs. + ** Known Issues + - A few users have reported crashes related to which-key popups when quitting + a key sequence with =C-g=. A possible fix is discussed in [[https://github.com/justbur/emacs-which-key/issues/130][this issue]]. diff -Nru emacs-which-key-3.3.0/README.org emacs-which-key-3.3.1/README.org --- emacs-which-key-3.3.0/README.org 2018-06-21 19:38:47.000000000 +0000 +++ emacs-which-key-3.3.1/README.org 2018-11-14 14:34:39.000000000 +0000 @@ -49,6 +49,7 @@ - [[#god-mode][God-mode]] - [[#more-examples][More Examples]] - [[#nice-display-with-split-frame][Nice Display with Split Frame]] + - [[#known-issues][Known Issues]] - [[#thanks][Thanks]] ** Install @@ -508,7 +509,9 @@ #+CAPTION: which-key in a frame with 2 vertical splits [[./img/which-key-bottom-split.png]] - +** Known Issues + - A few users have reported crashes related to which-key popups when quitting + a key sequence with =C-g=. A possible fix is discussed in [[https://github.com/justbur/emacs-which-key/issues/130][this issue]]. ** Thanks Special thanks to - [[https://github.com/bmag][@bmag]] for helping with the initial development and finding many bugs. diff -Nru emacs-which-key-3.3.0/.travis.yml emacs-which-key-3.3.1/.travis.yml --- emacs-which-key-3.3.0/.travis.yml 2018-06-21 19:38:47.000000000 +0000 +++ emacs-which-key-3.3.1/.travis.yml 2018-11-14 14:34:39.000000000 +0000 @@ -5,6 +5,7 @@ - EVM_EMACS=emacs-25.1-travis - EVM_EMACS=emacs-25.2-travis - EVM_EMACS=emacs-25.3-travis + - EVM_EMACS=emacs-26.1-travis - EVM_EMACS=emacs-git-snapshot-travis before_install: diff -Nru emacs-which-key-3.3.0/which-key.el emacs-which-key-3.3.1/which-key.el --- emacs-which-key-3.3.0/which-key.el 2018-06-21 19:38:47.000000000 +0000 +++ emacs-which-key-3.3.1/which-key.el 2018-11-14 14:34:39.000000000 +0000 @@ -5,7 +5,7 @@ ;; Author: Justin Burkett ;; Maintainer: Justin Burkett ;; URL: https://github.com/justbur/emacs-which-key -;; Version: 3.3.0 +;; Version: 3.3.1 ;; Keywords: ;; Package-Requires: ((emacs "24.4")) @@ -1111,7 +1111,8 @@ (delete-frame which-key--frame))) (defun which-key--popup-showing-p () - (window-live-p (get-buffer-window which-key--buffer))) + (and (bufferp which-key--buffer) + (window-live-p (get-buffer-window which-key--buffer)))) (defun which-key--show-popup (act-popup-dim) "Show the which-key buffer. @@ -2192,13 +2193,18 @@ "Call the command in `which-key--prefix-help-cmd-backup'. Usually this is `describe-prefix-bindings'." (interactive) - (let ((which-key-inhibit t)) + (let ((which-key-inhibit t) + (popup-showing (which-key--popup-showing-p))) (which-key--hide-popup-ignore-command) - (cond ((eq which-key--prefix-help-cmd-backup - 'describe-prefix-bindings) - ;; This is essentially what `describe-prefix-bindings' does - (describe-bindings - (kbd (which-key--current-key-string)))) + (cond ((and (eq which-key--prefix-help-cmd-backup + 'describe-prefix-bindings) + ;; If the popup is not showing, we call + ;; `describe-prefix-bindings' directly. + popup-showing) + ;; This is essentially what `describe-prefix-bindings' does. We can't + ;; use this function directly, because the prefix will not be correct + ;; when we enter using `which-key-C-h-dispatch'. + (describe-bindings (kbd (which-key--current-key-string)))) ((functionp which-key--prefix-help-cmd-backup) (funcall which-key--prefix-help-cmd-backup)))))