[elpa] master eafdd36: [el-search] Don't initially fold El Occur buffers
branch: master commit eafdd36ee0a776a695fc02962dfe9e303593055d Author: Michael Heerdegen Commit: Michael Heerdegen [el-search] Don't initially fold El Occur buffers This didn't always work correctly and may also be irritating for new users. Bump version to 1.7.15. * packages/el-search/el-search.el (el-search--occur): Don't initially fold *El Occur* buffer. --- packages/el-search/NEWS | 4 packages/el-search/el-search.el | 19 +-- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/packages/el-search/NEWS b/packages/el-search/NEWS index 863d2f5..cc5d877 100644 --- a/packages/el-search/NEWS +++ b/packages/el-search/NEWS @@ -1,6 +1,10 @@ Some of the user visible news were: +Version: 1.7.15 + + *El Occur* buffers are now initially unfolded. + Version: 1.7.8 Similar to isearch, el-search now opens invisible text. diff --git a/packages/el-search/el-search.el b/packages/el-search/el-search.el index 4f4b0eb..2c7246a 100644 --- a/packages/el-search/el-search.el +++ b/packages/el-search/el-search.el @@ -7,7 +7,7 @@ ;; Created: 29 Jul 2015 ;; Keywords: lisp ;; Compatibility: GNU Emacs 25 -;; Version: 1.7.14 +;; Version: 1.7.15 ;; Package-Requires: ((emacs "25") (stream "2.2.4") (cl-print "1.0")) @@ -256,9 +256,8 @@ ;; match in that buffer or file. With S-tab you can (un)collapse all ;; file sections like in `org-mode' to see only file names and the ;; number of matches, or everything. Tab folds and unfolds -;; expressions (this uses hideshow; initially, all expressions are -;; folded to one line) and also sections at the beginning of -;; headlines. +;; expressions (this uses hideshow) and also sections at the beginning +;; of headlines. ;; ;; ;; Multiple multi searches @@ -3273,14 +3272,7 @@ Prompt for a new pattern and revert." (point) (el-search--end-of-sexp context-beg)) (let ((inhibit-message t) (message-log-max nil)) -(indent-region insertion-point (point)) -(save-excursion - (goto-char insertion-point) - (ignore-errors -;; This can error... -(if nil ;if need-context -(hs-hide-level 1) - (hs-hide-block) +(indent-region insertion-point (point))) (insert "\n"))) (save-excursion @@ -3315,8 +3307,7 @@ Prompt for a new pattern and revert." Buffers and files are separated by headlines. Matches are highlighted with face `el-search-match'. For short matches, some -context is shown, and nearby matches are grouped. Initially all -expressions are folded to one line. +context is shown, and nearby matches are grouped. \\ Clicking on a file or buffer name displays it in a different window and goes to the first match.
[elpa] master 542c7d0: * nhexl-mode.el: Make C-u use hexadecimal
branch: master
commit 542c7d0b6802135877b47b66c6b13d66e5f9f30b
Author: Stefan Monnier
Commit: Stefan Monnier
* nhexl-mode.el: Make C-u use hexadecimal
(nhexl-universal-argument-map): New var.
(nhexl--universal-argument-description)
(nhexl--universal-argument-mode): New advice functions.
(nhexl-digit-argument): New command.
---
packages/nhexl-mode/nhexl-mode.el | 72 ++-
1 file changed, 71 insertions(+), 1 deletion(-)
diff --git a/packages/nhexl-mode/nhexl-mode.el
b/packages/nhexl-mode/nhexl-mode.el
index 4635251..b7221bf 100644
--- a/packages/nhexl-mode/nhexl-mode.el
+++ b/packages/nhexl-mode/nhexl-mode.el
@@ -4,7 +4,7 @@
;; Author: Stefan Monnier
;; Keywords: data
-;; Version: 0.9
+;; Version: 1.0
;; Package-Requires: ((emacs "24.4") (cl-lib "0.5"))
;; This program is free software; you can redistribute it and/or modify
@@ -40,6 +40,9 @@
;; - `nhexl-overwrite-only-mode': a minor mode to try and avoid moving text.
;; In this minor mode, not only self-inserting keys overwrite existing
;; text, but commands like `yank' and `kill-region' as well.
+;;
+;; - it overrides C-u to use hexadecimal, so you can do C-u a 4 C-f
+;; to advance by #xa4 characters.
;; Even though the hex addresses displayed by this mode aren't actually
;; part of the buffer's text (contrary to hexl-mode, for example), you can
@@ -836,5 +839,72 @@ existing text, if needed with
`nhexl-overwrite-clear-byte'."
(unless (eql pow2bytes nhexl-line-width)
(setq-local nhexl-line-width pow2bytes))
+; The main prefix command.
+
+(defvar nhexl-universal-argument-map
+ (let ((map (make-sparse-keymap)))
+(set-keymap-parent map universal-argument-map)
+(define-key map [?\C-u] 'universal-argument-more)
+(define-key map [remap digit-argument] 'nhexl-digit-argument)
+(dolist (k '("a" "b" "c" "d" "e" "f"))
+ (define-key map k 'nhexl-digit-argument))
+map)
+ "Keymap used while processing nhexl-mode's \\[universal-argument].")
+
+;; FIXME: Using advice is ugly!
+
+;; Instead of an advice, we'd prefer to replace universal-argument--description
+;; on prefix-command-echo-keystrokes-functions, but there's no mechanism to
+;; do that.
+(advice-add 'universal-argument--description :around
+#'nhexl--universal-argument-description)
+(defun nhexl--universal-argument-description (orig-fun &rest args)
+ (cond
+ ((not nhexl-mode) (apply orig-fun args))
+ ((null prefix-arg) nil)
+ (t
+(concat "C-u"
+(pcase prefix-arg
+ (`(-) " -")
+ (`(,(and (pred integerp) n))
+ (let ((str ""))
+ (while (and (> n 4) (= (mod n 4) 0))
+ (setq str (concat str " C-u"))
+ (setq n (/ n 4)))
+ (if (= n 4) str (format " %s" prefix-arg
+ ((pred integerp) (format " #x%X" prefix-arg))
+ (_ (format " %s" prefix-arg)))
+
+(advice-add 'universal-argument--mode :around
+#'nhexl--universal-argument-mode)
+(defun nhexl--universal-argument-mode (orig-fun &rest args)
+ (if (not nhexl-mode)
+ (apply orig-fun args)
+(let ((universal-argument-map nhexl-universal-argument-map))
+ (apply orig-fun args
+
+(defun nhexl-digit-argument (arg)
+ "Part of the hexadecimal numeric argument for the next command.
+\\[universal-argument] following digits or minus sign ends the argument."
+ (interactive "P")
+ (prefix-command-preserve-state)
+ (let* ((keys (this-command-keys))
+ (key (aref keys (1- (length keys
+ (char (if (integerp key) (logand key #x7f)))
+(digit (cond
+ ((<= ?a char ?f) (+ 10 (- char ?a)))
+ ((<= ?A char ?F) (+ 10 (- char ?A)))
+ ((<= ?0 char ?9) (- char ?0)
+(setq prefix-arg (cond ((integerp arg)
+(+ (* arg 16)
+ (if (< arg 0) (- digit) digit)))
+ ((eq arg '-)
+;; Treat -0 as just -, so that -01 will work.
+(if (zerop digit) '- (- digit)))
+ (t
+digit
+ (universal-argument--mode))
+
+
(provide 'nhexl-mode)
;;; nhexl-mode.el ends here
