aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2014-08-03 23:27:14 -0700
committerPaul Eggert2014-08-03 23:27:14 -0700
commit44a651f0f2e1668bdbbacca3bf5d405c34e67ff2 (patch)
treefda407e035f284f686c5bae631a592fa5dad2b88
parentf045dbe6a0e173eb60383199319b35835254f452 (diff)
downloademacs-44a651f0f2e1668bdbbacca3bf5d405c34e67ff2.tar.gz
emacs-44a651f0f2e1668bdbbacca3bf5d405c34e67ff2.zip
* rect.el (rectangle--default-line-number-format): Rename
from misspelled rectange--default-line-number-format (Bug#18045). All uses changed.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/rect.el6
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 28fa5d1a5e6..9039e43b009 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12014-08-04 Paul Eggert <eggert@cs.ucla.edu>
2
3 * rect.el (rectangle--default-line-number-format): Rename
4 from misspelled rectange--default-line-number-format (Bug#18045).
5 All uses changed.
6
12014-08-03 Paul Eggert <eggert@cs.ucla.edu> 72014-08-03 Paul Eggert <eggert@cs.ucla.edu>
2 8
3 Don't mishandle year-9999 dates (Bug#18176). 9 Don't mishandle year-9999 dates (Bug#18176).
diff --git a/lisp/rect.el b/lisp/rect.el
index e536e3e372c..0350ed6b22b 100644
--- a/lisp/rect.el
+++ b/lisp/rect.el
@@ -520,7 +520,7 @@ rectangle which were empty."
520 (setq rectangle-number-line-counter 520 (setq rectangle-number-line-counter
521 (1+ rectangle-number-line-counter))) 521 (1+ rectangle-number-line-counter)))
522 522
523(defun rectange--default-line-number-format (start end start-at) 523(defun rectangle--default-line-number-format (start end start-at)
524 (concat "%" 524 (concat "%"
525 (int-to-string (length (int-to-string (+ (count-lines start end) 525 (int-to-string (length (int-to-string (+ (count-lines start end)
526 start-at)))) 526 start-at))))
@@ -541,11 +541,11 @@ with a prefix argument, prompt for START-AT and FORMAT."
541 (start-at (read-number "Number to count from: " 1))) 541 (start-at (read-number "Number to count from: " 1)))
542 (list start end start-at 542 (list start end start-at
543 (read-string "Format string: " 543 (read-string "Format string: "
544 (rectange--default-line-number-format 544 (rectangle--default-line-number-format
545 start end start-at)))) 545 start end start-at))))
546 (list (region-beginning) (region-end) 1 nil))) 546 (list (region-beginning) (region-end) 1 nil)))
547 (unless format 547 (unless format
548 (setq format (rectange--default-line-number-format start end start-at))) 548 (setq format (rectangle--default-line-number-format start end start-at)))
549 (let ((rectangle-number-line-counter start-at)) 549 (let ((rectangle-number-line-counter start-at))
550 (apply-on-rectangle 'rectangle-number-line-callback 550 (apply-on-rectangle 'rectangle-number-line-callback
551 start end format))) 551 start end format)))