branch: externals/shell-command+ commit a69ad3b9327b652dd782a1189d896914036624c9 Author: Philip Kaludercic <p...@posteo.net> Commit: Philip Kaludercic <p...@posteo.net>
Fix non-Emacs 24.3 compatible code --- shell-command+.el | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/shell-command+.el b/shell-command+.el index 483eb194a2..1c8a4410b7 100644 --- a/shell-command+.el +++ b/shell-command+.el @@ -289,7 +289,8 @@ prefix the command with \"../../../../\" or \"....\".") (pcase (shell-command+-tokenize command) (`(,_ "log") (vc-print-log)) (`(,_ "log" ,ref) (vc-print-log ref)) - (`(,_ "push") (vc-push)) + ((and (guard (fboundp 'vc-push)) `(,_ "push")) + (vc-push)) (`(,_ "pull") (vc-update)) (`(,_ "fetch") (vc-log-incoming)) (`(,_ "merge") (vc-merge)) @@ -300,8 +301,8 @@ prefix the command with \"../../../../\" or \"....\".") (defcustom shell-command+-clear-function (lambda () - (when-let* ((win (get-buffer-window))) - (quit-window t win))) + (let ((win (get-buffer-window))) + (when win (quit-window t win)))) "Function to invoke without any arguments when handling \"clear\"." :type 'function)