1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-04 21:12:23 -08:00
Commit graph

64 commits

Author SHA1 Message Date
justbur
a657ea8faf Change side-window default position to right 2015-07-06 14:40:07 -04:00
justbur
b2ea6227c3 Try without close timer 2015-07-06 14:39:02 -04:00
Justin Burkett
73d5374546 Merge pull request #13 from bmag/pre-command-hook
Hide buffer right before command execution
2015-07-06 14:28:39 -04:00
justbur
1fd43dc7fb Merge branch 'frame-popup' of https://github.com/bmag/emacs-which-key into pr12 2015-07-06 14:23:56 -04:00
justbur
85f65a910d Work on docstrings 2015-07-06 14:22:08 -04:00
justbur
c8bf18a49b Redo replacement logic 2015-07-06 13:53:10 -04:00
justbur
eb6f52a0cb Make arrow separator into variable 2015-07-06 13:40:49 -04:00
justbur
9cec7b8e1d Refactor replacement alists 2015-07-06 13:23:19 -04:00
Bar Magal
1cbad4b774 Hide buffer right before command execution
Fixes #9, this is also what guide-key uses.

When quoting functions, using "#'" tells the compiler that you're
quoting a function, and allows it to catch void function errors.
2015-07-06 19:34:31 +03:00
Bar Magal
35a171ef7d Try to fix focus problems with popup frame #7 2015-07-06 19:22:40 +03:00
justbur
163eacfa9d Allow echo-keystrokes but make it quick 2015-07-06 11:18:55 -04:00
justbur
3119e80c3e Add .gitignore 2015-07-06 11:03:00 -04:00
justbur
a760c589db Fix problem with echo-keystrokes and minibuffer
If the echo-keystrokes delay is too long, it clobbers which-key in the
minibuffer
2015-07-06 10:54:24 -04:00
justbur
c551775370 Remove popwin requirement; Add require cl 2015-07-06 09:49:58 -04:00
justbur
38362826cf Merge branch 'master' of https://github.com/bmag/emacs-which-key into pr5 2015-07-06 08:08:32 -04:00
justbur
a1aa345111 Delete old defvars and minor docstring cleanup 2015-07-06 08:03:59 -04:00
Bar Magal
44450f60c7 Fix doc, new frame parameters 2015-07-06 14:51:31 +03:00
Bar Magal
02140265c4 Frame popup support and some small fixes
Summary of changes:
- add emacs 24.3 as a dependency, because
  `display-buffer-in-major-side-window` doesn't exist in older emacsen
- add option to show which-key buffer in a popup frame
  `(setq which-key-popup-type 'frame)`
- stop close timer when disabling which-key-mode
- don't hide which-key buffer before showing it. instead, show methods
  handle the case that the buffer is already shown
- `which-key/hide-popup` calls function depending on popup
  type (similar to `which-key/show-popup`)
- use `display-buffer-in-major-side-window` instead of
  `display-buffer-in-side-window`, for popup type side-window. ensures
  new side window is created properly even if other side windows already
  exist.
- erase previous contents of which-key buffer before inserting new
  contents, and adjust buffer display in window by moving point to
  the buffer's beginning
2015-07-06 13:46:46 +03:00
justbur
20353a2923 Rename config variables, simplifying interface
The primary config variable is now which-key-popup-type, which
supports 'minibuffer and 'side-window. 'side-window has further
associated options, primarily which-key-side-window-location
2015-07-05 23:06:06 -04:00
justbur
ab3ff4770f Merge bmag changes
See PR #1
2015-07-05 19:24:20 -04:00
justbur
da0f7e1cd1 Organize keys by pages 2015-07-05 18:26:18 -04:00
Bar Magal
963944cbf6 Undo unintentional delete of end-of-file comment 2015-07-05 23:26:47 +03:00
Bar Magal
1812df6695 Undo unintentional delete of provide line 2015-07-05 23:24:31 +03:00
Bar Magal
67065197d3 Refactor before work on window display
Wanted to add support for using display-buffer or popwin, ran into some
bugs, had to make changes to the code so future work will be easier.
Details below:

- separate between code to display window and code to populate buffer
  contents
- add `which-key-horizontal-buffer-height` similar to
  `which-key-vertical-buffer-width`
- abstract handling of different display methods into
  `which-key/show-buffer` and `which-key/hide-buffer`, instead of mixed
  in other functions
- remove `which-key/make-display-method-aliases`
- support two display methods: `minibuffer` and `side-window`, will add
  popwin later
- create start/stop functions for which-key--close-timer
- a few other changes
2015-07-05 23:10:01 +03:00
justbur
ffbdc2a3ca Reorganize code a little 2015-07-04 11:10:20 -04:00
justbur
17b5f3dfd9 Factor out display functions
To add customization options later
2015-07-04 11:07:22 -04:00
justbur
add8fca39f Change formatting of groups 2015-07-03 23:33:16 -04:00
justbur
8d9f79ac14 Toggle timer on frame focus 2015-07-03 23:02:51 -04:00
justbur
fa368fc611 Fix index error for subseq 2015-07-03 22:19:50 -04:00
justbur
558090e119 Switch default to minibuffer
There are a lot of changes here.
  1. Reorganized and factored a bunch of code.
  2. Rewrote the logic to calculate line breaks (much cleaner).
  3. Switched to using the minibuffer by default, which seems more
  foolproof and saves line space (I'm sure there's something wrong with
  this).
2015-07-03 22:10:34 -04:00
justbur
3e704213fb Update docstrings and fix packaging 2015-07-03 15:39:56 -04:00
justbur
6875c207b8 Move cursor code to setup 2015-07-03 13:25:26 -04:00
justbur
5af44458b7 Try to hide cursor 2015-07-03 13:07:07 -04:00
justbur
31dff26dad Better picture 2015-07-03 13:06:43 -04:00
justbur
79ec100fb4 Get the cursor out of the way 2015-07-03 12:51:05 -04:00
justbur
beaba56f36 Add picture to readme 2015-07-03 12:50:37 -04:00
justbur
5185467c6b Arrows are more fun
Also add padding between entries
2015-07-03 12:42:03 -04:00
justbur
5039c93d86 Switch readme to org-mode 2015-07-03 08:40:09 -04:00
justbur
c77a6efccb Switch back to popwin for now 2015-07-03 08:32:40 -04:00
justbur
63fde0d3f2 Remove unnecessary checks 2015-07-03 08:12:10 -04:00
justbur
230ffc306f Save popwin functions as comments 2015-07-03 08:09:27 -04:00
justbur
776e39e98b Merge branch 'display-buffer' 2015-07-03 08:07:02 -04:00
justbur
5614be0e7d Remove commented funcs and messages 2015-07-02 21:33:35 -04:00
justbur
41d0d60c3d Add option to select display-buffer function.
Only 2 are implemented at the moment.
2015-07-02 21:28:48 -04:00
justbur
ada5cfda1c Declare `which-key--close-timer' 2015-07-02 20:05:01 -04:00
justbur
515ed1df96 Fix close timer randomly kicking in
when you take too long to decide
2015-07-02 19:31:33 -04:00
justbur
d57fca695d Fix text replacement alist
Conflicts:
	which-key.el
2015-07-02 19:12:00 -04:00
justbur
b353cd2a35 Fix text replacement alist 2015-07-02 19:09:11 -04:00
justbur
94d5fd571c Switch from popwin to display-buffer 2015-07-02 18:19:32 -04:00
justbur
04708f29d8 Start working on MELPA requirements 2015-07-02 11:41:59 -04:00