[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7311-g6ed015f
Brad King
brad.king at kitware.com
Tue Jan 28 12:44:40 EST 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 6ed015f4ef359a22629abc32dd4bef5e82176db7 (commit)
via 9b3876bfbca2354fca7386499899b8ad0b66a96d (commit)
via d3db7126e654ac947db7653250030c858070e746 (commit)
via fbc3a6f33e41913ca481377418dee8e7f5b9b380 (commit)
from b70bfe6d97d3756f58fba12534888286958fe454 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ed015f4ef359a22629abc32dd4bef5e82176db7
commit 6ed015f4ef359a22629abc32dd4bef5e82176db7
Merge: b70bfe6 9b3876b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 28 12:44:39 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 28 12:44:39 2014 -0500
Merge topic 'emacs-mode-byte-compile' into next
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
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b3876bfbca2354fca7386499899b8ad0b66a96d
commit 9b3876bfbca2354fca7386499899b8ad0b66a96d
Author: Philipp Möller <bootsarehax at googlemail.com>
AuthorDate: Tue Jan 28 18:05:21 2014 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 28 12:44:02 2014 -0500
cmake-mode.el: Replace 'setq' with 'let' or inlining
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
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d3db7126e654ac947db7653250030c858070e746
commit d3db7126e654ac947db7653250030c858070e746
Author: Philipp Möller <bootsarehax at googlemail.com>
AuthorDate: Tue Jan 28 17:54:56 2014 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 28 12:41:11 2014 -0500
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.
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)
)
;------------------------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fbc3a6f33e41913ca481377418dee8e7f5b9b380
commit fbc3a6f33e41913ca481377418dee8e7f5b9b380
Author: Philipp Möller <bootsarehax at googlemail.com>
AuthorDate: Tue Jan 28 17:53:29 2014 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 28 12:39:50 2014 -0500
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))
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))
)
)
-----------------------------------------------------------------------
Summary of changes:
Auxiliary/cmake-mode.el | 49 +++++++++++++++++++++++------------------------
1 file changed, 24 insertions(+), 25 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list