[Packages] Update

This commit is contained in:
Daniel - 2017-09-22 18:57:02 +02:00
parent 0b77d724b4
commit beb99bf0ba
Signed by: dbo
GPG Key ID: 4F63DB96D45AA9C6
22 changed files with 160 additions and 132 deletions

View File

@ -3,7 +3,7 @@
;;; Code: ;;; Code:
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
;;;### (autoloads nil "hydra" "hydra.el" (22942 51276 155994 337000)) ;;;### (autoloads nil "hydra" "hydra.el" (22981 14450 559411 900000))
;;; Generated autoloads from hydra.el ;;; Generated autoloads from hydra.el
(autoload 'defhydra "hydra" "\ (autoload 'defhydra "hydra" "\
@ -65,7 +65,7 @@ result of `defhydra'.
;;;*** ;;;***
;;;### (autoloads nil nil ("hydra-examples.el" "hydra-ox.el" "hydra-pkg.el" ;;;### (autoloads nil nil ("hydra-examples.el" "hydra-ox.el" "hydra-pkg.el"
;;;;;; "lv.el") (22942 51276 167994 399000)) ;;;;;; "lv.el") (22981 14450 567411 943000))
;;;*** ;;;***

View File

@ -1,4 +1,4 @@
(define-package "hydra" "20170813.1058" "Make bindings that stick around." (define-package "hydra" "20170903.218" "Make bindings that stick around."
'((cl-lib "0.5")) '((cl-lib "0.5"))
:url "https://github.com/abo-abo/hydra" :keywords :url "https://github.com/abo-abo/hydra" :keywords
'("bindings")) '("bindings"))

View File

@ -639,91 +639,92 @@ HEAD's binding is returned as a string wrapped with [] or {}."
\"%`...\" expressions are extracted into \"%S\". \"%`...\" expressions are extracted into \"%S\".
_NAME, BODY, DOCSTRING and HEADS are parameters of `defhydra'. _NAME, BODY, DOCSTRING and HEADS are parameters of `defhydra'.
The expressions can be auto-expanded according to NAME." The expressions can be auto-expanded according to NAME."
(setq docstring (hydra--strip-align-markers docstring)) (unless (memq 'elisp--witness--lisp (mapcar #'cadr heads))
(setq docstring (replace-regexp-in-string "___" "_β_" docstring)) (setq docstring (hydra--strip-align-markers docstring))
(let ((rest (if (eq (plist-get (cddr body) :hint) 'none) (setq docstring (replace-regexp-in-string "___" "_β_" docstring))
"" (let ((rest (if (eq (plist-get (cddr body) :hint) 'none)
(hydra--hint body heads))) ""
(start 0) (hydra--hint body heads)))
varlist (start 0)
offset) varlist
(while (setq start offset)
(string-match (while (setq start
(format (string-match
"\\(?:%%\\( ?-?[0-9]*s?\\)\\(`[a-z-A-Z/0-9]+\\|(\\)\\)\\|\\(?:[_?]\\(%s\\)\\(%s\\)[_?]\\)" (format
hydra-width-spec-regex "\\(?:%%\\( ?-?[0-9]*s?\\)\\(`[a-z-A-Z/0-9]+\\|(\\)\\)\\|\\(?:[_?]\\(%s\\)\\(%s\\)[_?]\\)"
hydra-key-regex) hydra-width-spec-regex
docstring start)) hydra-key-regex)
(cond ((eq ?? (aref (match-string 0 docstring) 0)) docstring start))
(let* ((key (match-string 4 docstring)) (cond ((eq ?? (aref (match-string 0 docstring) 0))
(head (assoc key heads))) (let* ((key (match-string 4 docstring))
(if head (head (assoc key heads)))
(progn (if head
(push (nth 2 head) varlist) (progn
(setq docstring (push (nth 2 head) varlist)
(replace-match
(or
hydra-doc-format-spec
(concat "%" (match-string 3 docstring) "s"))
t nil docstring)))
(setq start (match-end 0))
(warn "Unrecognized key: ?%s?" key))))
((eq ?_ (aref (match-string 0 docstring) 0))
(let* ((key (match-string 4 docstring))
(key (if (equal key "β") "_" key))
normal-key
(head (or (assoc key heads)
(when (setq normal-key
(cdr (assoc
key hydra-docstring-keys-translate-alist)))
(assoc normal-key heads)))))
(if head
(progn
(push (hydra-fontify-head (if normal-key
(cons key (cdr head))
head)
body)
varlist)
(let ((replacement
(or
hydra-key-format-spec
(concat "%" (match-string 3 docstring) "s"))))
(setq docstring (setq docstring
(replace-match replacement t nil docstring)) (replace-match
(setq start (+ start (length replacement))))) (or
(setq start (match-end 0)) hydra-doc-format-spec
(warn "Unrecognized key: _%s_" key)))) (concat "%" (match-string 3 docstring) "s"))
t nil docstring)))
(setq start (match-end 0))
(warn "Unrecognized key: ?%s?" key))))
((eq ?_ (aref (match-string 0 docstring) 0))
(let* ((key (match-string 4 docstring))
(key (if (equal key "β") "_" key))
normal-key
(head (or (assoc key heads)
(when (setq normal-key
(cdr (assoc
key hydra-docstring-keys-translate-alist)))
(assoc normal-key heads)))))
(if head
(progn
(push (hydra-fontify-head (if normal-key
(cons key (cdr head))
head)
body)
varlist)
(let ((replacement
(or
hydra-key-format-spec
(concat "%" (match-string 3 docstring) "s"))))
(setq docstring
(replace-match replacement t nil docstring))
(setq start (+ start (length replacement)))))
(setq start (match-end 0))
(warn "Unrecognized key: _%s_" key))))
(t (t
(let* ((varp (if (eq ?` (aref (match-string 2 docstring) 0)) 1 0)) (let* ((varp (if (eq ?` (aref (match-string 2 docstring) 0)) 1 0))
(spec (match-string 1 docstring)) (spec (match-string 1 docstring))
(lspec (length spec))) (lspec (length spec)))
(setq offset (setq offset
(with-temp-buffer (with-temp-buffer
(insert (substring docstring (+ 1 start varp (insert (substring docstring (+ 1 start varp
(length spec)))) (length spec))))
(goto-char (point-min)) (goto-char (point-min))
(push (read (current-buffer)) varlist) (push (read (current-buffer)) varlist)
(- (point) (point-min)))) (- (point) (point-min))))
(when (or (zerop lspec) (when (or (zerop lspec)
(/= (aref spec (1- (length spec))) ?s)) (/= (aref spec (1- (length spec))) ?s))
(setq spec (concat spec "S"))) (setq spec (concat spec "S")))
(setq docstring (setq docstring
(concat (concat
(substring docstring 0 start) (substring docstring 0 start)
"%" spec "%" spec
(substring docstring (+ start offset 1 lspec varp)))))))) (substring docstring (+ start offset 1 lspec varp))))))))
(if (eq ?\n (aref docstring 0)) (if (eq ?\n (aref docstring 0))
`(concat (format ,(substring docstring 1) ,@(nreverse varlist)) `(concat (format ,(substring docstring 1) ,@(nreverse varlist))
,rest) ,rest)
(let ((r `(replace-regexp-in-string (let ((r `(replace-regexp-in-string
" +$" "" " +$" ""
(concat ,docstring ": " (concat ,docstring ": "
(replace-regexp-in-string (replace-regexp-in-string
"\\(%\\)" "\\1\\1" ,rest))))) "\\(%\\)" "\\1\\1" ,rest)))))
(if (stringp rest) (if (stringp rest)
`(format ,(eval r)) `(format ,(eval r))
`(format ,r)))))) `(format ,r)))))))
(defun hydra--complain (format-string &rest args) (defun hydra--complain (format-string &rest args)
"Forward to (`message' FORMAT-STRING ARGS) unless `hydra-verbose' is nil." "Forward to (`message' FORMAT-STRING ARGS) unless `hydra-verbose' is nil."

View File

@ -1,5 +0,0 @@
(define-package "multiple-cursors" "20170813.38" "Multiple cursors for Emacs."
'((cl-lib "0.5")))
;; Local Variables:
;; no-byte-compile: t
;; End:

View File

@ -3,8 +3,8 @@
;;; Code: ;;; Code:
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
;;;### (autoloads nil "mc-edit-lines" "mc-edit-lines.el" (22942 51258 ;;;### (autoloads nil "mc-edit-lines" "mc-edit-lines.el" (22981 14420
;;;;;; 659903 701000)) ;;;;;; 295246 728000))
;;; Generated autoloads from mc-edit-lines.el ;;; Generated autoloads from mc-edit-lines.el
(autoload 'mc/edit-lines "mc-edit-lines" "\ (autoload 'mc/edit-lines "mc-edit-lines" "\
@ -34,7 +34,7 @@ Add one cursor to the beginning of each line in the active region.
;;;*** ;;;***
;;;### (autoloads nil "mc-hide-unmatched-lines-mode" "mc-hide-unmatched-lines-mode.el" ;;;### (autoloads nil "mc-hide-unmatched-lines-mode" "mc-hide-unmatched-lines-mode.el"
;;;;;; (22942 51258 691903 867000)) ;;;;;; (22981 14420 327246 904000))
;;; Generated autoloads from mc-hide-unmatched-lines-mode.el ;;; Generated autoloads from mc-hide-unmatched-lines-mode.el
(autoload 'mc-hide-unmatched-lines-mode "mc-hide-unmatched-lines-mode" "\ (autoload 'mc-hide-unmatched-lines-mode "mc-hide-unmatched-lines-mode" "\
@ -48,8 +48,8 @@ mode. To leave this mode press <return> or \"C-g\"
;;;*** ;;;***
;;;### (autoloads nil "mc-mark-more" "mc-mark-more.el" (22942 51258 ;;;### (autoloads nil "mc-mark-more" "mc-mark-more.el" (22981 14420
;;;;;; 711903 971000)) ;;;;;; 355247 56000))
;;; Generated autoloads from mc-mark-more.el ;;; Generated autoloads from mc-mark-more.el
(autoload 'mc/mark-next-like-this "mc-mark-more" "\ (autoload 'mc/mark-next-like-this "mc-mark-more" "\
@ -246,8 +246,8 @@ Mark the tag we're in and its pair for renaming.
;;;*** ;;;***
;;;### (autoloads nil "mc-mark-pop" "mc-mark-pop.el" (22942 51258 ;;;### (autoloads nil "mc-mark-pop" "mc-mark-pop.el" (22981 14420
;;;;;; 679903 805000)) ;;;;;; 311246 816000))
;;; Generated autoloads from mc-mark-pop.el ;;; Generated autoloads from mc-mark-pop.el
(autoload 'mc/mark-pop "mc-mark-pop" "\ (autoload 'mc/mark-pop "mc-mark-pop" "\
@ -259,7 +259,7 @@ to the popped mark.
;;;*** ;;;***
;;;### (autoloads nil "mc-separate-operations" "mc-separate-operations.el" ;;;### (autoloads nil "mc-separate-operations" "mc-separate-operations.el"
;;;;;; (22942 51258 695903 888000)) ;;;;;; (22981 14420 335246 947000))
;;; Generated autoloads from mc-separate-operations.el ;;; Generated autoloads from mc-separate-operations.el
(autoload 'mc/insert-numbers "mc-separate-operations" "\ (autoload 'mc/insert-numbers "mc-separate-operations" "\
@ -299,7 +299,7 @@ Aligns all cursors with whitespace like `mc/vertical-align' does
;;;*** ;;;***
;;;### (autoloads nil "multiple-cursors-core" "multiple-cursors-core.el" ;;;### (autoloads nil "multiple-cursors-core" "multiple-cursors-core.el"
;;;;;; (22942 51258 651903 661000)) ;;;;;; (22981 14420 263246 553000))
;;; Generated autoloads from multiple-cursors-core.el ;;; Generated autoloads from multiple-cursors-core.el
(autoload 'multiple-cursors-mode "multiple-cursors-core" "\ (autoload 'multiple-cursors-mode "multiple-cursors-core" "\
@ -310,7 +310,7 @@ Mode while multiple cursors are active.
;;;*** ;;;***
;;;### (autoloads nil "rectangular-region-mode" "rectangular-region-mode.el" ;;;### (autoloads nil "rectangular-region-mode" "rectangular-region-mode.el"
;;;;;; (22942 51258 667903 743000)) ;;;;;; (22981 14420 303246 772000))
;;; Generated autoloads from rectangular-region-mode.el ;;; Generated autoloads from rectangular-region-mode.el
(autoload 'set-rectangular-region-anchor "rectangular-region-mode" "\ (autoload 'set-rectangular-region-anchor "rectangular-region-mode" "\
@ -329,7 +329,7 @@ A mode for creating a rectangular region to edit
;;;*** ;;;***
;;;### (autoloads nil nil ("mc-cycle-cursors.el" "multiple-cursors-pkg.el" ;;;### (autoloads nil nil ("mc-cycle-cursors.el" "multiple-cursors-pkg.el"
;;;;;; "multiple-cursors.el") (22942 51258 715903 992000)) ;;;;;; "multiple-cursors.el") (22981 14420 371247 144000))
;;;*** ;;;***

View File

@ -330,6 +330,11 @@ cursor with updated info."
:type '(boolean) :type '(boolean)
:group 'multiple-cursors) :group 'multiple-cursors)
(defcustom mc/always-repeat-command nil
"Disables confirmation for `mc/repeat-command' command."
:type '(boolean)
:group 'multiple-cursors)
(defun mc/prompt-for-inclusion-in-whitelist (original-command) (defun mc/prompt-for-inclusion-in-whitelist (original-command)
"Asks the user, then adds the command either to the once-list or the all-list." "Asks the user, then adds the command either to the once-list or the all-list."
(let ((all-p (y-or-n-p (format "Do %S for all cursors?" original-command)))) (let ((all-p (y-or-n-p (format "Do %S for all cursors?" original-command))))
@ -442,6 +447,17 @@ you should disable multiple-cursors-mode."
(multiple-cursors-mode 0) (multiple-cursors-mode 0)
(deactivate-mark))) (deactivate-mark)))
(defun mc/repeat-command ()
"Run last command from `command-history' for every fake cursor."
(interactive)
(when (or mc/always-repeat-command
(y-or-n-p (format "[mc] repeat complex command: %s? " (caar command-history))))
(mc/execute-command-for-all-fake-cursors
(lambda () (interactive)
(cl-letf (((symbol-function 'read-from-minibuffer)
(lambda (p &optional i k r h d m) (read i))))
(repeat-complex-command 0))))))
(defvar mc/keymap nil (defvar mc/keymap nil
"Keymap while multiple cursors are active. "Keymap while multiple cursors are active.
Main goal of the keymap is to rebind C-g and <return> to conclude Main goal of the keymap is to rebind C-g and <return> to conclude
@ -450,6 +466,7 @@ multiple cursors editing.")
(setq mc/keymap (make-sparse-keymap)) (setq mc/keymap (make-sparse-keymap))
(define-key mc/keymap (kbd "C-g") 'mc/keyboard-quit) (define-key mc/keymap (kbd "C-g") 'mc/keyboard-quit)
(define-key mc/keymap (kbd "<return>") 'multiple-cursors-mode) (define-key mc/keymap (kbd "<return>") 'multiple-cursors-mode)
(define-key mc/keymap (kbd "C-:") 'mc/repeat-command)
(when (fboundp 'phi-search) (when (fboundp 'phi-search)
(define-key mc/keymap (kbd "C-s") 'phi-search)) (define-key mc/keymap (kbd "C-s") 'phi-search))
(when (fboundp 'phi-search-backward) (when (fboundp 'phi-search-backward)
@ -551,7 +568,8 @@ from being executed if in multiple-cursors-mode."
(unsupported-cmd isearch-backward ". Feel free to add a compatible version.") (unsupported-cmd isearch-backward ". Feel free to add a compatible version.")
;; Make sure pastes from other programs are added to all kill-rings when yanking ;; Make sure pastes from other programs are added to all kill-rings when yanking
(defadvice current-kill (before interprogram-paste-for-all-cursors activate) (defadvice current-kill (before interprogram-paste-for-all-cursors
(n &optional do-not-move) activate)
(let ((interprogram-paste (and (= n 0) (let ((interprogram-paste (and (= n 0)
interprogram-paste-function interprogram-paste-function
(funcall interprogram-paste-function)))) (funcall interprogram-paste-function))))
@ -656,6 +674,7 @@ for running commands with multiple cursors."
mc/skip-to-previous-like-this mc/skip-to-previous-like-this
rrm/switch-to-multiple-cursors rrm/switch-to-multiple-cursors
mc-hide-unmatched-lines-mode mc-hide-unmatched-lines-mode
mc/repeat-command
hum/keyboard-quit hum/keyboard-quit
hum/unhide-invisible-overlays hum/unhide-invisible-overlays
save-buffer save-buffer
@ -664,6 +683,7 @@ for running commands with multiple cursors."
exit-minibuffer exit-minibuffer
minibuffer-complete-and-exit minibuffer-complete-and-exit
execute-extended-command execute-extended-command
eval-expression
undo undo
redo redo
undo-tree-undo undo-tree-undo
@ -697,7 +717,8 @@ for running commands with multiple cursors."
windmove-left windmove-left
windmove-right windmove-right
windmove-up windmove-up
windmove-down)) windmove-down
repeat-complex-command))
(defvar mc--default-cmds-to-run-for-all nil (defvar mc--default-cmds-to-run-for-all nil
"Default set of commands that should be mirrored by all cursors") "Default set of commands that should be mirrored by all cursors")

View File

@ -0,0 +1,5 @@
(define-package "multiple-cursors" "20170908.1452" "Multiple cursors for Emacs."
'((cl-lib "0.5")))
;; Local Variables:
;; no-byte-compile: t
;; End:

View File

@ -1,2 +0,0 @@
;;; -*- no-byte-compile: t -*-
(define-package "page-break-lines" "20170517.235" "Display ugly ^L page breaks as tidy horizontal lines" 'nil :commit "82f9100312dcc922fb66ff289faf5d4795d8ca7a" :url "https://github.com/purcell/page-break-lines" :keywords '("convenience" "faces"))

View File

@ -3,8 +3,8 @@
;;; Code: ;;; Code:
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
;;;### (autoloads nil "page-break-lines" "page-break-lines.el" (22830 ;;;### (autoloads nil "page-break-lines" "page-break-lines.el" (22981
;;;;;; 24428 923863 486000)) ;;;;;; 14380 755029 874000))
;;; Generated autoloads from page-break-lines.el ;;; Generated autoloads from page-break-lines.el
(defvar page-break-lines-char 9472 "\ (defvar page-break-lines-char 9472 "\

View File

@ -0,0 +1,2 @@
;;; -*- no-byte-compile: t -*-
(define-package "page-break-lines" "20170829.157" "Display ^L page breaks as tidy horizontal lines" 'nil :commit "913732ad06d838661989fb1fef05fcc9ca88f725" :url "https://github.com/purcell/page-break-lines" :keywords '("convenience" "faces"))

View File

@ -1,11 +1,11 @@
;;; page-break-lines.el --- Display ugly ^L page breaks as tidy horizontal lines ;;; page-break-lines.el --- Display ^L page breaks as tidy horizontal lines
;; Copyright (C) 2012-2015 Steve Purcell ;; Copyright (C) 2012-2015 Steve Purcell
;; Author: Steve Purcell <steve@sanityinc.com> ;; Author: Steve Purcell <steve@sanityinc.com>
;; URL: https://github.com/purcell/page-break-lines ;; URL: https://github.com/purcell/page-break-lines
;; Package-Version: 20170517.235 ;; Package-Version: 20170829.157
;; Package-X-Original-Version: DEV ;; Package-X-Original-Version: 0
;; Keywords: convenience, faces ;; Keywords: convenience, faces
;; This program is free software; you can redistribute it and/or modify ;; This program is free software; you can redistribute it and/or modify
@ -37,7 +37,7 @@
;; If `page-break-lines-char' is displayed at a different width to ;; If `page-break-lines-char' is displayed at a different width to
;; regular characters, the rule may be either too short or too long: ;; regular characters, the rule may be either too short or too long:
;; rules may then wrap if `truncate-lines' is nil. On some systems, ;; rules may then wrap if `truncate-lines' is nil. On some systems,
;; Emacs may erroneously choose a different font for the page break ;; Emacs may erroneously choose a different font for the page break
;; symbol, which choice can be overridden using code such as: ;; symbol, which choice can be overridden using code such as:
@ -108,7 +108,8 @@ horizontal line of `page-break-string-char' characters."
(dolist (hook '(window-configuration-change-hook (dolist (hook '(window-configuration-change-hook
window-size-change-functions window-size-change-functions
after-setting-font-hook)) after-setting-font-hook
display-line-numbers-mode-hook))
(add-hook hook 'page-break-lines--update-display-tables)) (add-hook hook 'page-break-lines--update-display-tables))
@ -118,28 +119,32 @@ horizontal line of `page-break-string-char' characters."
If the buffer inside WINDOW has `page-break-lines-mode' enabled, If the buffer inside WINDOW has `page-break-lines-mode' enabled,
its display table will be modified as necessary." its display table will be modified as necessary."
(with-current-buffer (window-buffer window) (with-current-buffer (window-buffer window)
(if page-break-lines-mode (with-selected-window window
(progn (if page-break-lines-mode
(unless buffer-display-table (progn
(setq buffer-display-table (make-display-table))) (unless buffer-display-table
(let ((default-height (face-attribute 'default :height nil 'default))) (setq buffer-display-table (make-display-table)))
(set-face-attribute 'page-break-lines nil :height default-height) (let ((default-height (face-attribute 'default :height nil 'default)))
(let* ((cwidth (char-width page-break-lines-char)) (set-face-attribute 'page-break-lines nil :height default-height)
(wwidth (window-width window)) (let* ((cwidth (char-width page-break-lines-char))
(width (if (zerop (% wwidth cwidth)) (wwidth (- (window-width)
(1- (/ wwidth cwidth)) (if (bound-and-true-p display-line-numbers)
(/ wwidth cwidth))) (+ (line-number-display-width) 2)
(glyph (make-glyph-code page-break-lines-char 'page-break-lines)) 0)
(new-display-entry (vconcat (make-list width glyph)))) (if (display-graphic-p) 0 1)))
(unless (equal new-display-entry (elt buffer-display-table ?\^L)) (width (/ wwidth cwidth))
(aset buffer-display-table ?\^L new-display-entry))))) (glyph (make-glyph-code page-break-lines-char 'page-break-lines))
(when (and (member major-mode page-break-lines-modes) (new-display-entry (vconcat (make-list width glyph))))
buffer-display-table) (unless (equal new-display-entry (elt buffer-display-table ?\^L))
(aset buffer-display-table ?\^L nil))))) (aset buffer-display-table ?\^L new-display-entry)))))
(when (and (member major-mode page-break-lines-modes)
buffer-display-table)
(aset buffer-display-table ?\^L nil))))))
(defun page-break-lines--update-display-tables (&optional frame) (defun page-break-lines--update-display-tables (&optional frame)
"Function called for updating display table in windows of FRAME." "Function called for updating display table in windows of FRAME."
(mapc 'page-break-lines--update-display-table (window-list frame 'no-minibuffer))) (unless (minibufferp)
(mapc 'page-break-lines--update-display-table (window-list frame 'no-minibuffer))))
@ -155,6 +160,7 @@ When `major-mode' is listed in `page-break-lines-modes', then
;;;###autoload ;;;###autoload
(define-global-minor-mode global-page-break-lines-mode (define-global-minor-mode global-page-break-lines-mode
page-break-lines-mode page-break-lines-mode-maybe page-break-lines-mode page-break-lines-mode-maybe
:require 'page-break-lines
:group 'page-break-lines) :group 'page-break-lines)