[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r117288: * align.el (align-adjust-col-for-rule):
From: |
Leo Liu |
Subject: |
[Emacs-diffs] emacs-24 r117288: * align.el (align-adjust-col-for-rule): Unbreak due to defaulting |
Date: |
Mon, 23 Jun 2014 23:13:42 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117288
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16381
committer: Leo Liu <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-06-24 07:09:20 +0800
message:
* align.el (align-adjust-col-for-rule): Unbreak due to defaulting
tab-stop-list to nil.
* indent.el (indent-next-tab-stop): Rename from indent--next-tab-stop.
(indent-rigidly-left-to-tab-stop)
(indent-rigidly-right-to-tab-stop, tab-to-tab-stop)
(move-to-tab-stop): Change callers.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/align.el align.el-20091113204419-o5vbwnq5f7feedwu-1758
lisp/indent.el indent.el-20091113204419-o5vbwnq5f7feedwu-230
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-06-22 16:59:30 +0000
+++ b/lisp/ChangeLog 2014-06-23 23:09:20 +0000
@@ -1,3 +1,13 @@
+2014-06-23 Leo Liu <address@hidden>
+
+ * align.el (align-adjust-col-for-rule): Unbreak due to defaulting
+ tab-stop-list to nil. (Bug#16381)
+
+ * indent.el (indent-next-tab-stop): Rename from indent--next-tab-stop.
+ (indent-rigidly-left-to-tab-stop)
+ (indent-rigidly-right-to-tab-stop, tab-to-tab-stop)
+ (move-to-tab-stop): Change callers.
+
2014-06-22 Eli Zaretskii <address@hidden>
* skeleton.el (skeleton-insert): Yet another fix of the doc string
=== modified file 'lisp/align.el'
--- a/lisp/align.el 2014-03-24 16:54:24 +0000
+++ b/lisp/align.el 2014-06-23 23:09:20 +0000
@@ -1130,13 +1130,8 @@
column
(if (not tab-stop)
(+ column spacing)
- (let ((stops tab-stop-list))
- (while stops
- (if (and (> (car stops) column)
- (= (setq spacing (1- spacing)) 0))
- (setq column (car stops)
- stops nil)
- (setq stops (cdr stops)))))
+ (dotimes (_ spacing)
+ (setq column (indent-next-tab-stop column)))
column)))
(defsubst align-column (pos)
=== modified file 'lisp/indent.el'
--- a/lisp/indent.el 2014-02-10 01:34:22 +0000
+++ b/lisp/indent.el 2014-06-23 23:09:20 +0000
@@ -249,7 +249,7 @@
(indent-rigidly--pop-undo)
(let* ((current (indent-rigidly--current-indentation beg end))
(rtl (eq (current-bidi-paragraph-direction) 'right-to-left))
- (next (indent--next-tab-stop current (if rtl nil 'prev))))
+ (next (indent-next-tab-stop current (if rtl nil 'prev))))
(indent-rigidly beg end (- next current))))
(defun indent-rigidly-right-to-tab-stop (beg end)
@@ -258,7 +258,7 @@
(indent-rigidly--pop-undo)
(let* ((current (indent-rigidly--current-indentation beg end))
(rtl (eq (current-bidi-paragraph-direction) 'right-to-left))
- (next (indent--next-tab-stop current (if rtl 'prev))))
+ (next (indent-next-tab-stop current (if rtl 'prev))))
(indent-rigidly beg end (- next current))))
(defun indent-line-to (column)
@@ -654,7 +654,7 @@
(setq tab-stop-list tabs))
(message "Tab stops installed"))
-(defun indent--next-tab-stop (column &optional prev)
+(defun indent-next-tab-stop (column &optional prev)
"Return the next tab stop after COLUMN.
If PREV is non-nil, return the previous one instead."
(let ((tabs tab-stop-list))
@@ -684,7 +684,7 @@
(interactive)
(and abbrev-mode (= (char-syntax (preceding-char)) ?w)
(expand-abbrev))
- (let ((nexttab (indent--next-tab-stop (current-column))))
+ (let ((nexttab (indent-next-tab-stop (current-column))))
(delete-horizontal-space t)
(indent-to nexttab)))
@@ -693,7 +693,7 @@
The variable `tab-stop-list' is a list of columns at which there are tab stops.
Use \\[edit-tab-stops] to edit them interactively."
(interactive)
- (let ((nexttab (indent--next-tab-stop (current-column))))
+ (let ((nexttab (indent-next-tab-stop (current-column))))
(let ((before (point)))
(move-to-column nexttab t)
(save-excursion
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r117288: * align.el (align-adjust-col-for-rule): Unbreak due to defaulting,
Leo Liu <=