branch: master
commit 39e7fb6af0f6cd19273c08b83f1b1a954df8b770
Author: Daiki Ueno <[email protected]>
Commit: Daiki Ueno <[email protected]>
Rename some commands
---
gnome-c-align.el | 14 +++++++-------
gnome-c-snippet.el | 6 +++---
gnome-c-style.el | 6 +++---
gnome-c-tests.el | 24 ++++++++++++------------
4 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/gnome-c-align.el b/gnome-c-align.el
index c7bcddd..dd2dafa 100644
--- a/gnome-c-align.el
+++ b/gnome-c-align.el
@@ -190,7 +190,7 @@
arglist))))
;;;###autoload
-(defun gnome-c-align-at-point (&optional identifier-start-column)
+(defun gnome-c-align-arglist-at-point (&optional identifier-start-column)
"Reformat argument list at point, aligning argument to the right end."
(interactive)
(save-excursion
@@ -409,7 +409,7 @@
(push decl decls))))
decls))))
-(defun gnome-c-align--compute-optimal-columns (beg end)
+(defun gnome-c-align--guess-optimal-columns (beg end)
(let ((buffer (current-buffer))
decls)
(with-temp-buffer
@@ -434,14 +434,14 @@
arglist-identifier-start-column))))))
;;;###autoload
-(defun gnome-c-align-compute-optimal-columns (beg end)
+(defun gnome-c-align-guess-optimal-columns (beg end)
"Compute the optimal alignment rule from the declarations in BEG and END.
This sets `gnome-c-align-identifier-start-column',
`gnome-c-align-arglist-start-column', and
`gnome-c-align-arglist-identifier-start-column'."
(interactive "r")
- (let ((columns (gnome-c-align--compute-optimal-columns beg end)))
+ (let ((columns (gnome-c-align--guess-optimal-columns beg end)))
(setq gnome-c-align-identifier-start-column
(cdr (assq 'identifier-start-column columns))
gnome-c-align-arglist-start-column
@@ -489,7 +489,7 @@ This sets `gnome-c-align-identifier-start-column',
gnome-c-align-arglist-identifier-start-column)))
;;;###autoload
-(defun gnome-c-align-region (beg end)
+(defun gnome-c-align-decls-region (beg end)
"Reformat function declarations in the region between BEG and END."
(interactive "r")
(save-excursion
@@ -499,7 +499,7 @@ This sets `gnome-c-align-identifier-start-column',
(unless (and gnome-c-align-identifier-start-column
gnome-c-align-arglist-start-column
gnome-c-align-arglist-identifier-start-column)
- (let ((columns (gnome-c-align--compute-optimal-columns beg end)))
+ (let ((columns (gnome-c-align--guess-optimal-columns beg end)))
(unless gnome-c-align-identifier-start-column
(setq gnome-c-align-identifier-start-column
(cdr (assq 'identifier-start-column columns))))
@@ -522,7 +522,7 @@ This sets `gnome-c-align-identifier-start-column',
(gnome-c-align--indent-to-column
gnome-c-align-arglist-start-column)
(forward-char)
- (gnome-c-align-at-point
+ (gnome-c-align-arglist-at-point
(- (- gnome-c-align-arglist-identifier-start-column
(length "("))
gnome-c-align-arglist-start-column)))))))
diff --git a/gnome-c-snippet.el b/gnome-c-snippet.el
index 0f18834..85e23e8 100644
--- a/gnome-c-snippet.el
+++ b/gnome-c-snippet.el
@@ -318,7 +318,7 @@ GObjectConstructParam *construct_properties)\n")
(if gnome-c-snippet-align-arglist
(progn
(goto-char arglist-start)
- (gnome-c-align-at-point))
+ (gnome-c-align-arglist-at-point))
(indent-region arglist-start (point)))
(goto-char body-start)
(insert "{
@@ -350,7 +350,7 @@ GParamSpec *pspec)\n")
(if gnome-c-snippet-align-arglist
(progn
(goto-char arglist-start)
- (gnome-c-align-at-point))
+ (gnome-c-align-arglist-at-point))
(indent-region arglist-start (point)))
(goto-char body-start)
(insert "{
@@ -387,7 +387,7 @@ GParamSpec *pspec)\n")
(if gnome-c-snippet-align-arglist
(progn
(goto-char arglist-start)
- (gnome-c-align-at-point))
+ (gnome-c-align-arglist-at-point))
(indent-region arglist-start (point)))
(goto-char body-start)
(insert "{
diff --git a/gnome-c-style.el b/gnome-c-style.el
index c39c0d1..0ea5f93 100644
--- a/gnome-c-style.el
+++ b/gnome-c-style.el
@@ -54,11 +54,11 @@
(defvar gnome-c-style-mode-map
(let ((keymap (make-sparse-keymap)))
- (define-key keymap "\C-c\C-ga" 'gnome-c-align-at-point)
- (define-key keymap "\C-c\C-gr" 'gnome-c-align-region)
+ (define-key keymap "\C-c\C-ga" 'gnome-c-align-arglist-at-point)
+ (define-key keymap "\C-c\C-gr" 'gnome-c-align-decls-region)
(define-key keymap "\C-c\C-gf" 'gnome-c-align-set-column)
(define-key keymap "\C-c\C-gg" 'gnome-c-align-guess-columns)
- (define-key keymap "\C-c\C-g\C-g" 'gnome-c-align-compute-optimal-columns)
+ (define-key keymap "\C-c\C-g\C-g" 'gnome-c-align-guess-optimal-columns)
(define-key keymap "\C-c\C-gc" 'gnome-c-snippet-insert-package_class)
(define-key keymap "\C-c\C-gC" 'gnome-c-snippet-insert-PACKAGE_CLASS)
(define-key keymap "\C-c\C-g\C-c" 'gnome-c-snippet-insert-PackageClass)
diff --git a/gnome-c-tests.el b/gnome-c-tests.el
index c49b0b5..59ae8ee 100644
--- a/gnome-c-tests.el
+++ b/gnome-c-tests.el
@@ -78,46 +78,46 @@ int *bar (const char * const **a,
int b);
")
-(ert-deftest gnome-c-test-align--compute-optimal-columns ()
- "Tests the `gnome-c-align--compute-optimal-columns'."
+(ert-deftest gnome-c-test-align--guess-optimal-columns ()
+ "Tests the `gnome-c-align--guess-optimal-columns'."
(with-temp-buffer
(insert gnome-c-test-program-1)
(c-mode)
(let* (gnome-c-align-max-column
(columns
- (gnome-c-align--compute-optimal-columns (point-min) (point-max))))
+ (gnome-c-align--guess-optimal-columns (point-min) (point-max))))
(should (= (cdr (assq 'identifier-start-column columns)) 9))
(should (= (cdr (assq 'arglist-start-column columns)) 41))
(should (= (cdr (assq 'arglist-identifier-start-column columns)) 64)))))
(ert-deftest gnome-c-test-align-region ()
- "Tests the `gnome-c-align-region'."
+ "Tests the `gnome-c-align-decls-region'."
(with-temp-buffer
(insert gnome-c-test-program-1)
(c-mode)
(let (gnome-c-align-max-column)
- (gnome-c-align-compute-optimal-columns (point-min) (point-max))
- (gnome-c-align-region (point-min) (point-max)))
+ (gnome-c-align-guess-optimal-columns (point-min) (point-max))
+ (gnome-c-align-decls-region (point-min) (point-max)))
(should (equal (buffer-string) gnome-c-test-program-1-aligned))))
(ert-deftest gnome-c-test-align-region-2 ()
- "Tests the `gnome-c-align-region'."
+ "Tests the `gnome-c-align-decls-region'."
(with-temp-buffer
(insert gnome-c-test-program-4)
(c-mode)
(let (gnome-c-align-max-column)
- (gnome-c-align-compute-optimal-columns (point-min) (point-max))
- (gnome-c-align-region (point-min) (point-max)))
+ (gnome-c-align-guess-optimal-columns (point-min) (point-max))
+ (gnome-c-align-decls-region (point-min) (point-max)))
(should (equal (buffer-string) gnome-c-test-program-4-aligned))))
(ert-deftest gnome-c-test-align-region-3 ()
- "Tests the `gnome-c-align-region'."
+ "Tests the `gnome-c-align-decls-region'."
(with-temp-buffer
(insert gnome-c-test-program-5)
(c-mode)
(let (gnome-c-align-max-column)
- (gnome-c-align-compute-optimal-columns (point-min) (point-max))
- (gnome-c-align-region (point-min) (point-max)))
+ (gnome-c-align-guess-optimal-columns (point-min) (point-max))
+ (gnome-c-align-decls-region (point-min) (point-max)))
(should (equal (buffer-string) gnome-c-test-program-5-aligned))))
(ert-deftest gnome-c-test-align-guess-columns-1 ()
