[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 1e9276a 12/22: Remove trailing whitespace from :columns do
|
From: |
Oleh Krehel |
|
Subject: |
[elpa] master 1e9276a 12/22: Remove trailing whitespace from :columns docstring |
|
Date: |
Fri, 16 Oct 2015 10:06:57 +0000 |
branch: master
commit 1e9276adfedd000bced3834684ed8674af52575f
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
Remove trailing whitespace from :columns docstring
* hydra.el (hydra--format): Update.
* hydra-test.el (hydra-columns-1): Update.
Fixes #146
---
hydra-test.el | 92 ++++++++++++++++++--------------------------------------
hydra.el | 7 +++-
2 files changed, 35 insertions(+), 64 deletions(-)
diff --git a/hydra-test.el b/hydra-test.el
index 8dac9f7..dd6f31e 100644
--- a/hydra-test.el
+++ b/hydra-test.el
@@ -1381,70 +1381,38 @@ _w_ Worf: % -8`hydra-tng/worf^^
_h_ Set phasers to
("T" Info-toc "TOC")
("u" Info-up "up")
("m" Info-menu "menu")
- ("t" hydra-info-to/body "info-to"))))))
- (format
- #("Info-mode:
-?: summary ]: forward [: backward
-<: top node >: final node h: help
-d: info dir f: follow ref g: goto node
-l: hist back r: hist forward i: index
-I: virtual index L: hist n: next
-p: previous s: search S: case-search
-T: TOC u: up m: menu
-t: info-to "
- 12 13 (face hydra-face-blue)
- 29 30 (face hydra-face-blue)
- 46 47 (face hydra-face-blue)
- 64 65 (face hydra-face-blue)
- 81 82 (face hydra-face-blue)
- 98 99 (face hydra-face-blue)
- 116 117 (face hydra-face-blue)
- 133 134 (face hydra-face-blue)
- 150 151 (face hydra-face-blue)
- 168 169 (face hydra-face-blue)
- 185 186 (face hydra-face-blue)
- 202 203 (face hydra-face-blue)
- 220 221 (face hydra-face-blue)
- 237 238 (face hydra-face-blue)
- 254 255 (face hydra-face-blue)
- 272 273 (face hydra-face-blue)
- 289 290 (face hydra-face-blue)
- 306 307 (face hydra-face-blue)
- 324 325 (face hydra-face-blue)
- 341 342 (face hydra-face-blue)
- 358 359 (face hydra-face-blue)
- 376 377 (face hydra-face-blue))))
- #("Info-mode:
-?: summary ]: forward [: backward
-<: top node >: final node h: help
-d: info dir f: follow ref g: goto node
-l: hist back r: hist forward i: index
-I: virtual index L: hist n: next
-p: previous s: search S: case-search
-T: TOC u: up m: menu
-t: info-to "
- 12 13 (face hydra-face-blue)
- 29 30 (face hydra-face-blue)
- 46 47 (face hydra-face-blue)
- 64 65 (face hydra-face-blue)
- 81 82 (face hydra-face-blue)
- 98 99 (face hydra-face-blue)
+ ("t" hydra-info-to/body "info-to")))))))
+ #("Info-mode:
+?: summary ]: forward [: backward
+<: top node >: final node h: help
+d: info dir f: follow ref g: goto node
+l: hist back r: hist forward i: index
+I: virtual index L: hist n: next
+p: previous s: search S: case-search
+T: TOC u: up m: menu
+t: info-to"
+ 11 12 (face hydra-face-blue)
+ 28 29 (face hydra-face-blue)
+ 45 46 (face hydra-face-blue)
+ 57 58 (face hydra-face-blue)
+ 74 75 (face hydra-face-blue)
+ 91 92 (face hydra-face-blue)
+ 99 100 (face hydra-face-blue)
116 117 (face hydra-face-blue)
133 134 (face hydra-face-blue)
- 150 151 (face hydra-face-blue)
- 168 169 (face hydra-face-blue)
- 185 186 (face hydra-face-blue)
- 202 203 (face hydra-face-blue)
- 220 221 (face hydra-face-blue)
- 237 238 (face hydra-face-blue)
- 254 255 (face hydra-face-blue)
- 272 273 (face hydra-face-blue)
- 289 290 (face hydra-face-blue)
- 306 307 (face hydra-face-blue)
- 324 325 (face hydra-face-blue)
- 341 342 (face hydra-face-blue)
- 358 359 (face hydra-face-blue)
- 376 377 (face hydra-face-blue)))))
+ 146 147 (face hydra-face-blue)
+ 163 164 (face hydra-face-blue)
+ 180 181 (face hydra-face-blue)
+ 189 190 (face hydra-face-blue)
+ 206 207 (face hydra-face-blue)
+ 223 224 (face hydra-face-blue)
+ 231 232 (face hydra-face-blue)
+ 248 249 (face hydra-face-blue)
+ 265 266 (face hydra-face-blue)
+ 280 281 (face hydra-face-blue)
+ 297 298 (face hydra-face-blue)
+ 314 315 (face hydra-face-blue)
+ 322 323 (face hydra-face-blue)))))
(provide 'hydra-test)
diff --git a/hydra.el b/hydra.el
index cf11d43..ef2c5a9 100644
--- a/hydra.el
+++ b/hydra.el
@@ -587,8 +587,11 @@ The expressions can be auto-expanded according to NAME."
(if (eq ?\n (aref docstring 0))
`(concat (format ,(substring docstring 1) ,@(nreverse varlist))
,rest)
- `(format ,(concat docstring ": " (replace-regexp-in-string
- "\\(%\\)" "\\1\\1" rest))))))
+ `(format ,(replace-regexp-in-string
+ " +$" ""
+ (concat docstring ": "
+ (replace-regexp-in-string
+ "\\(%\\)" "\\1\\1" rest)))))))
(defun hydra--complain (format-string &rest args)
"Forward to (`message' FORMAT-STRING ARGS) unless `hydra-verbose' is nil."
- [elpa] master a2f8a23 01/22: Allow to escape ^ in docstrings, (continued)
- [elpa] master a2f8a23 01/22: Allow to escape ^ in docstrings, Oleh Krehel, 2015/10/16
- [elpa] master 2d45839 03/22: lv-window: split-window ignores window parameters, Oleh Krehel, 2015/10/16
- [elpa] master fca56c3 07/22: targets/hydra-init.el: Move, Oleh Krehel, 2015/10/16
- [elpa] master 1a13273 06/22: Allow to pause arbitrary hydras to the stack, Oleh Krehel, 2015/10/16
- [elpa] master adc2997 08/22: Allow for "_[_" and "_]_" in docs, Oleh Krehel, 2015/10/16
- [elpa] master 1acd5f6 05/22: hydra.el (hydra-face-blue): Customize for dark themes, Oleh Krehel, 2015/10/16
- [elpa] master c8b4749 09/22: Allow binding heads to "%", Oleh Krehel, 2015/10/16
- [elpa] master 7aa8187 13/22: Allow to specify :face for each head, Oleh Krehel, 2015/10/16
- [elpa] master df7b079 10/22: hydra.el (hydra-head-format): Customize the key formatting, Oleh Krehel, 2015/10/16
- [elpa] master 900ca34 04/22: Allow access to the current hydra body, Oleh Krehel, 2015/10/16
- [elpa] master 1e9276a 12/22: Remove trailing whitespace from :columns docstring,
Oleh Krehel <=
- [elpa] master 852ae26 14/22: Use quote instead of function to prevent compiler warnings, Oleh Krehel, 2015/10/16
- [elpa] master ea36afc 19/22: Allow "_", "!", and "&" as keys in docstrings, Oleh Krehel, 2015/10/16
- [elpa] master f58d356 17/22: Allow #'command syntax for heads, just to have it, Oleh Krehel, 2015/10/16
- [elpa] master 27b7f40 15/22: Make find-function work with defhydra, Oleh Krehel, 2015/10/16
- [elpa] master 3fb3168 18/22: hydra.el (hydra--format): Allow "@" key in the docs, Oleh Krehel, 2015/10/16
- [elpa] master 336602f 11/22: Add :columns option for hydra body, Oleh Krehel, 2015/10/16
- [elpa] master 4bf7f1c 21/22: Bump version, Oleh Krehel, 2015/10/16
- [elpa] master c5327e1 16/22: Declare dired-mark to silence byte-compiler, Oleh Krehel, 2015/10/16
- [elpa] master 39eed63 20/22: hydra.el (hydra-disable): Deactivate key-chord advice more, Oleh Krehel, 2015/10/16
- [elpa] master bfeccce 22/22: Merge commit '4bf7f1c9e46fb819c673e55d8a1891774e139f98' from hydra, Oleh Krehel, 2015/10/16