diff options
| author | Marc Chevrier <marc.chevrier@gmail.com> | 2023-04-22 08:28:08 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-04-22 08:28:24 (GMT) |
| commit | a2fc16510ce3f89e34bd802c808d10951cfc94f5 (patch) | |
| tree | 2e044d6d3e39e405bf0ee2996e43ecd0076477be | |
| parent | 79d0deccc731ff6351506e0abae5803a45d396b6 (diff) | |
| parent | 0722569cf3af3584e16b2e79bf4ca3b7c90251dd (diff) | |
| download | CMake-a2fc16510ce3f89e34bd802c808d10951cfc94f5.zip CMake-a2fc16510ce3f89e34bd802c808d10951cfc94f5.tar.gz CMake-a2fc16510ce3f89e34bd802c808d10951cfc94f5.tar.bz2 | |
Merge topic 'emacs-mode-shell-quote-fix'
0722569cf3 Properly handle cases where `topic` argument is defaulted
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8424
| -rw-r--r-- | Auxiliary/cmake-mode.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Auxiliary/cmake-mode.el b/Auxiliary/cmake-mode.el index 7590ee3..6bd23bf 100644 --- a/Auxiliary/cmake-mode.el +++ b/Auxiliary/cmake-mode.el @@ -372,7 +372,7 @@ optional argument topic will be appended to the argument list." (interactive "s") (let* ((bufname (if buffer buffer (concat "*CMake" type (if topic "-") topic "*"))) (buffer (if (get-buffer bufname) (get-buffer bufname) (generate-new-buffer bufname))) - (command (concat cmake-mode-cmake-executable " " type " " (shell-quote-argument topic))) + (command (concat cmake-mode-cmake-executable " " type " " (if topic (shell-quote-argument topic) topic))) ;; Turn of resizing of mini-windows for shell-command. (resize-mini-windows nil) ) @@ -391,7 +391,7 @@ optional argument topic will be appended to the argument list." (interactive "s") (let* ((bufname (if buffer buffer (concat "*CMake" type (if topic "-") topic "*"))) (buffer (if (get-buffer bufname) (get-buffer bufname) (generate-new-buffer bufname))) - (command (concat cmake-mode-cmake-executable " " type " " (shell-quote-argument topic))) + (command (concat cmake-mode-cmake-executable " " type " " (if topic (shell-quote-argument topic) topic))) ;; Turn of resizing of mini-windows for shell-command. (resize-mini-windows nil) ) |