From fbc3a6f33e41913ca481377418dee8e7f5b9b380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20M=C3=B6ller?= Date: Tue, 28 Jan 2014 17:53:29 +0100 Subject: cmake-mode.el: Avoid using beginning-of-buffer This should not be used from lisp programs. Use the replacement suggested by the doc: (goto-char (point-min)) --- Auxiliary/cmake-mode.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Auxiliary/cmake-mode.el b/Auxiliary/cmake-mode.el index 9c73647..7355b7c 100644 --- a/Auxiliary/cmake-mode.el +++ b/Auxiliary/cmake-mode.el @@ -79,7 +79,7 @@ set the path with these commands: (if (save-excursion (beginning-of-line) (let ((parse-end (point))) - (beginning-of-buffer) + (goto-char (point-min)) (nth 3 (parse-partial-sexp (point) parse-end)) ) ) -- cgit v0.12 From d3db7126e654ac947db7653250030c858070e746 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20M=C3=B6ller?= Date: Tue, 28 Jan 2014 17:54:56 +0100 Subject: cmake-mode.el: Don't assign to free variable save-point Drop use of the free variable from unscreamify-cmake-buffer. The proper way to do this would be defvar or let, but it is more sensible to drop the feature completely: replace-match will shift the point and the saved-point will be invalid. More careful coding could avoid this, but seems overkill. --- Auxiliary/cmake-mode.el | 2 -- 1 file changed, 2 deletions(-) diff --git a/Auxiliary/cmake-mode.el b/Auxiliary/cmake-mode.el index 7355b7c..eb6e84e 100644 --- a/Auxiliary/cmake-mode.el +++ b/Auxiliary/cmake-mode.el @@ -186,7 +186,6 @@ the indentation. Otherwise it retains the same position on the line" (defun unscreamify-cmake-buffer () "Convert all CMake commands to lowercase in buffer." (interactive) - (setq save-point (point)) (goto-char (point-min)) (while (re-search-forward "^\\([ \t]*\\)\\(\\w+\\)\\([ \t]*(\\)" nil t) (replace-match @@ -195,7 +194,6 @@ the indentation. Otherwise it retains the same position on the line" (downcase (match-string 2)) (match-string 3)) t)) - (goto-char save-point) ) ;------------------------------------------------------------------------------ -- cgit v0.12 From 9b3876bfbca2354fca7386499899b8ad0b66a96d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20M=C3=B6ller?= Date: Tue, 28 Jan 2014 18:05:21 +0100 Subject: cmake-mode.el: Replace 'setq' with 'let' or inlining --- Auxiliary/cmake-mode.el | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/Auxiliary/cmake-mode.el b/Auxiliary/cmake-mode.el index eb6e84e..119168d 100644 --- a/Auxiliary/cmake-mode.el +++ b/Auxiliary/cmake-mode.el @@ -276,25 +276,27 @@ optional argument topic will be appended to the argument list." (if buffer (display-buffer buffer 'not-this-window) ;; Buffer doesn't exist. Create it and fill it - (setq buffer (generate-new-buffer bufname)) - (setq command (concat cmake-mode-cmake-executable " " type " " topic)) - (message "Running %s" command) - ;; We don't want the contents of the shell-command running to the - ;; minibuffer, so turn it off. A value of nil means don't automatically - ;; resize mini-windows. - (setq resize-mini-windows-save resize-mini-windows) - (setq resize-mini-windows nil) - (shell-command command buffer) - ;; Save the original window, so that we can come back to it later. - ;; save-excursion doesn't seem to work for this. - (setq window (selected-window)) - ;; We need to select it so that we can apply special modes to it - (select-window (display-buffer buffer 'not-this-window)) - (cmake-mode) - (toggle-read-only t) - ;; Restore the original window - (select-window window) - (setq resize-mini-windows resize-mini-windows-save) + (let ((buffer (generate-new-buffer bufname)) + (command (concat cmake-mode-cmake-executable " " type " " topic)) + ) + (message "Running %s" command) + ;; We don't want the contents of the shell-command running to the + ;; minibuffer, so turn it off. A value of nil means don't automatically + ;; resize mini-windows. + (setq resize-mini-windows-save resize-mini-windows) + (setq resize-mini-windows nil) + (shell-command command buffer) + ;; Save the original window, so that we can come back to it later. + ;; save-excursion doesn't seem to work for this. + (setq window (selected-window)) + ;; We need to select it so that we can apply special modes to it + (select-window (display-buffer buffer 'not-this-window)) + (cmake-mode) + (toggle-read-only t) + ;; Restore the original window + (select-window window) + (setq resize-mini-windows resize-mini-windows-save) + ) ) ) ) @@ -330,9 +332,8 @@ optional argument topic will be appended to the argument list." (defun cmake-help-command () "Prints out the help message corresponding to the command the cursor is on." (interactive) - (setq command (cmake-get-topic "command")) - (cmake-command-run "--help-command" (downcase command)) - ) + (cmake-command-run "--help-command" (downcase (cmake-get-topic "command")))) + ;;;###autoload (progn -- cgit v0.12