aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Eglen2002-09-26 15:52:31 +0000
committerStephen Eglen2002-09-26 15:52:31 +0000
commit4e141ed744f843814cf1bcc0d0fe5a5f674419f6 (patch)
treed9e616fed7224d2654e0245e6e9a08996f8ab6e8
parent3bcd2096bb3dcfb06b74214e598d6c10329e544e (diff)
downloademacs-4e141ed744f843814cf1bcc0d0fe5a5f674419f6.tar.gz
emacs-4e141ed744f843814cf1bcc0d0fe5a5f674419f6.zip
(iswitchb-completions): Test that iswitchb-common-match-string is a
string, before printing common completions.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/iswitchb.el3
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2aa6353cf02..82937573af9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12002-09-26 Stephen Eglen <stephen@gnu.org>
2
3 * iswitchb.el (iswitchb-completions): Test that
4 iswitchb-common-match-string is a string, before printing common
5 completions.
6
12002-09-24 Simon Josefsson <jas@extundo.com> 72002-09-24 Simon Josefsson <jas@extundo.com>
2 8
3 * mail/mail-extr.el (mail-extr-ignore-single-names): Change default. 9 * mail/mail-extr.el (mail-extr-ignore-single-names): Change default.
diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el
index 0b283d0ae77..d24f737851b 100644
--- a/lisp/iswitchb.el
+++ b/lisp/iswitchb.el
@@ -1260,7 +1260,8 @@ Modified from `icomplete-completions'."
1260 1260
1261 ;; put in common completion item -- what you get by 1261 ;; put in common completion item -- what you get by
1262 ;; pressing tab 1262 ;; pressing tab
1263 (if (> (length iswitchb-common-match-string) (length name)) 1263 (if (and (stringp iswitchb-common-match-string)
1264 (> (length iswitchb-common-match-string) (length name)))
1264 (concat open-bracket-determined 1265 (concat open-bracket-determined
1265 (substring iswitchb-common-match-string 1266 (substring iswitchb-common-match-string
1266 (length name)) 1267 (length name))