kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'emacs-mode-byte-compile'

Browse Source 
9b3876bf cmake-mode.el: Replace 'setq' with 'let' or inlining
d3db7126 cmake-mode.el: Don't assign to free variable save-point
fbc3a6f3 cmake-mode.el: Avoid using beginning-of-buffer
This commit is contained in:
Brad King 2014-01-29 10:04:59 -05:00 committed by CMake Topic Stage
commit 2816ffae90
1 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Auxiliary/cmake-mode.el
View File

@ -79,7 +79,7 @@ set the path with these commands:
(if (save-excursion (if (save-excursion
(beginning-of-line) (beginning-of-line)
(let ((parse-end (point))) (let ((parse-end (point)))
(beginning-of-buffer) (goto-char (point-min))
(nth 3 (parse-partial-sexp (point) parse-end)) (nth 3 (parse-partial-sexp (point) parse-end))
) )
) )
@ -186,7 +186,6 @@ the indentation. Otherwise it retains the same position on the line"
(defun unscreamify-cmake-buffer () (defun unscreamify-cmake-buffer ()
"Convert all CMake commands to lowercase in buffer." "Convert all CMake commands to lowercase in buffer."
(interactive) (interactive)
(setq save-point (point))
(goto-char (point-min)) (goto-char (point-min))
(while (re-search-forward "^\\([ \t]*\\)\\(\\w+\\)\\([ \t]*(\\)" nil t) (while (re-search-forward "^\\([ \t]*\\)\\(\\w+\\)\\([ \t]*(\\)" nil t)
(replace-match (replace-match
@ -195,7 +194,6 @@ the indentation. Otherwise it retains the same position on the line"
(downcase (match-string 2)) (downcase (match-string 2))
(match-string 3)) (match-string 3))
t)) t))
(goto-char save-point)
) )
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
@ -278,25 +276,27 @@ optional argument topic will be appended to the argument list."
(if buffer (if buffer
(display-buffer buffer 'not-this-window) (display-buffer buffer 'not-this-window)
;; Buffer doesn't exist. Create it and fill it ;; Buffer doesn't exist. Create it and fill it
(setq buffer (generate-new-buffer bufname)) (let ((buffer (generate-new-buffer bufname))
(setq command (concat cmake-mode-cmake-executable " " type " " topic)) (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 (message "Running %s" command)
;; minibuffer, so turn it off. A value of nil means don't automatically ;; We don't want the contents of the shell-command running to the
;; resize mini-windows. ;; minibuffer, so turn it off. A value of nil means don't automatically
(setq resize-mini-windows-save resize-mini-windows) ;; resize mini-windows.
(setq resize-mini-windows nil) (setq resize-mini-windows-save resize-mini-windows)
(shell-command command buffer) (setq resize-mini-windows nil)
;; Save the original window, so that we can come back to it later. (shell-command command buffer)
;; save-excursion doesn't seem to work for this. ;; Save the original window, so that we can come back to it later.
(setq window (selected-window)) ;; save-excursion doesn't seem to work for this.
;; We need to select it so that we can apply special modes to it (setq window (selected-window))
(select-window (display-buffer buffer 'not-this-window)) ;; We need to select it so that we can apply special modes to it
(cmake-mode) (select-window (display-buffer buffer 'not-this-window))
(toggle-read-only t) (cmake-mode)
;; Restore the original window (toggle-read-only t)
(select-window window) ;; Restore the original window
(setq resize-mini-windows resize-mini-windows-save) (select-window window)
(setq resize-mini-windows resize-mini-windows-save)
)
) )
) )
) )
@ -332,9 +332,8 @@ optional argument topic will be appended to the argument list."
(defun cmake-help-command () (defun cmake-help-command ()
"Prints out the help message corresponding to the command the cursor is on." "Prints out the help message corresponding to the command the cursor is on."
(interactive) (interactive)
(setq command (cmake-get-topic "command")) (cmake-command-run "--help-command" (downcase (cmake-get-topic "command"))))
(cmake-command-run "--help-command" (downcase command))
)
;;;###autoload ;;;###autoload
(progn (progn