[elpa] externals/company 60b01bf 1/2: Refactor search-mode keypad key press workaround
branch: externals/company commit 60b01bfc7b75730a4136e5d807f55f5867928d78 Author: YE Commit: YE Refactor search-mode keypad key press workaround Relates to #273, #1117. --- company.el | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/company.el b/company.el index af61696..6d34b78 100644 --- a/company.el +++ b/company.el @@ -2138,16 +2138,18 @@ each one wraps a part of the input string." (cl-return i)) (cl-incf i -(defun company-search-keypad () - (interactive) - (let* ((name (symbol-name last-command-event)) - (last-command-event (aref name (1- (length name) -(company-search-printing-char))) - (defun company-search-printing-char () (interactive) (company--search-assert-enabled) - (let ((ss (concat company-search-string (string last-command-event + (let* ((event-type (event-basic-type last-command-event)) + (event-string (if (characterp event-type) + (string last-command-event) + ;; Handle key press on the keypad. + (let ((name (symbol-name event-type))) + (if (string-match "kp-\\([0-9]\\)" name) + (match-string 1 name) + (error "Unexpected printing char input") + (ss (concat company-search-string event-string))) (when company-search-filtering (company--search-update-predicate ss)) (company--search-update-string ss))) @@ -2254,7 +2256,7 @@ each one wraps a part of the input string." (define-key keymap (vector i) 'company-search-printing-char) (cl-incf i)) (dotimes (i 10) - (define-key keymap (read (format "[kp-%s]" i)) 'company-search-keypad)) + (define-key keymap (kbd (format "" i)) 'company-search-printing-char)) (let ((meta-map (make-sparse-keymap))) (define-key keymap (char-to-string meta-prefix-char) meta-map) (define-key keymap [escape] meta-map))
[elpa] externals/company b73c5ae 2/2: Merge pull request #1119 from yugaego/search-keypad
branch: externals/company commit b73c5ae025ce8822794820bce3adfcd37be1aa84 Merge: b712017 60b01bf Author: Dmitry Gutov Commit: GitHub Merge pull request #1119 from yugaego/search-keypad Refactor search-mode keypad key press workaround --- company.el | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/company.el b/company.el index af61696..6d34b78 100644 --- a/company.el +++ b/company.el @@ -2138,16 +2138,18 @@ each one wraps a part of the input string." (cl-return i)) (cl-incf i -(defun company-search-keypad () - (interactive) - (let* ((name (symbol-name last-command-event)) - (last-command-event (aref name (1- (length name) -(company-search-printing-char))) - (defun company-search-printing-char () (interactive) (company--search-assert-enabled) - (let ((ss (concat company-search-string (string last-command-event + (let* ((event-type (event-basic-type last-command-event)) + (event-string (if (characterp event-type) + (string last-command-event) + ;; Handle key press on the keypad. + (let ((name (symbol-name event-type))) + (if (string-match "kp-\\([0-9]\\)" name) + (match-string 1 name) + (error "Unexpected printing char input") + (ss (concat company-search-string event-string))) (when company-search-filtering (company--search-update-predicate ss)) (company--search-update-string ss))) @@ -2254,7 +2256,7 @@ each one wraps a part of the input string." (define-key keymap (vector i) 'company-search-printing-char) (cl-incf i)) (dotimes (i 10) - (define-key keymap (read (format "[kp-%s]" i)) 'company-search-keypad)) + (define-key keymap (kbd (format "" i)) 'company-search-printing-char)) (let ((meta-map (make-sparse-keymap))) (define-key keymap (char-to-string meta-prefix-char) meta-map) (define-key keymap [escape] meta-map))
[elpa] externals/emms 231741e: * emms-player-mpv.el: explicitly unpause after switching to a new track
branch: externals/emms commit 231741e58222b4707f5686176670d2fe47cfa947 Author: Mike Kazantsev Commit: fraggod@malediction * emms-player-mpv.el: explicitly unpause after switching to a new track --- emms-player-mpv.el | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/emms-player-mpv.el b/emms-player-mpv.el index 399ec82..72b2cb5 100644 --- a/emms-player-mpv.el +++ b/emms-player-mpv.el @@ -224,7 +224,7 @@ runs 'stop'.") (defvar emms-player-mpv-event-connect-hook nil - "Normal hook run right after establishing new JSON IPC connection to mpv. + "Normal hook run right after establishing new JSON IPC connection to mpv. Run before `emms-player-mpv-ipc-connect-command', if any. Best place to send any `observe_property', `request_log_messages', `enable_event' commands. @@ -804,7 +804,7 @@ if there was any issue when trying to start it initially." (emms-player-mpv-cmd mpv-cmd (lambda (_mpv-data _mpv-error) (emms-player-mpv-cmd mpv-cmd) - (emms-player-mpv-cmd `(set pause no)) + (emms-player-mpv-cmd '(set pause no)) (defun emms-player-mpv-start (track) (setq emms-player-mpv-stopped nil) @@ -825,7 +825,8 @@ if there was any issue when trying to start it initially." track-name 'replace)) (start-func (lambda () (emms-player-mpv-cmd start-cmd - (apply-partially #'emms-player-mpv-start-error-handler ',start-cmd) + (apply-partially #'emms-player-mpv-start-error-handler ',start-cmd)) + (emms-player-mpv-cmd '(set pause no) (if emms-player-mpv-ipc-stop-command (setq emms-player-mpv-ipc-stop-command start-func) (funcall start-func))
