aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThien-Thi Nguyen2005-08-08 00:20:19 +0000
committerThien-Thi Nguyen2005-08-08 00:20:19 +0000
commitb499789ca4bc09fc61a6746cb15193a6378f231d (patch)
tree79e6a52bda33900cf7559054f5782cf420f656f7
parentbcc7dd61345b60c5a16ef3caaa96a878d1edbd45 (diff)
downloademacs-b499789ca4bc09fc61a6746cb15193a6378f231d.tar.gz
emacs-b499789ca4bc09fc61a6746cb15193a6378f231d.zip
(Info-dir-remove-duplicates): Avoid case folding in loop;
instead, keep downcased strings for comparison.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/info.el5
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c70ccb0d7ff..6347844b6ad 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12005-08-08 Thien-Thi Nguyen <ttn@gnu.org>
2
3 * info.el (Info-dir-remove-duplicates): Avoid case folding
4 in loop; instead, keep downcased strings for comparison.
5 Suggested by Helmut Eller.
6
12005-08-07 Michael Albinus <michael.albinus@gmx.de> 72005-08-07 Michael Albinus <michael.albinus@gmx.de>
2 8
3 Sync with Tramp 2.0.50. 9 Sync with Tramp 2.0.50.
diff --git a/lisp/info.el b/lisp/info.el
index 78a9e8a08a2..b97ad624d2d 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1157,8 +1157,9 @@ a case-insensitive match is tried."
1157 (goto-char start) 1157 (goto-char start)
1158 (while (re-search-forward "^* \\([^:\n]+:\\(:\\|[^.\n]+\\).\\)" 1158 (while (re-search-forward "^* \\([^:\n]+:\\(:\\|[^.\n]+\\).\\)"
1159 limit 'move) 1159 limit 'move)
1160 (let ((x (match-string 1))) 1160 ;; Fold case straight away; `member-ignore-case' here wasteful.
1161 (if (member-ignore-case x seen) 1161 (let ((x (downcase (match-string 1))))
1162 (if (member x seen)
1162 (delete-region (match-beginning 0) 1163 (delete-region (match-beginning 0)
1163 (progn (re-search-forward "^[^ \t]" nil t) 1164 (progn (re-search-forward "^[^ \t]" nil t)
1164 (match-beginning 0))) 1165 (match-beginning 0)))