diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2006-12-16 00:47:30 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2006-12-16 00:47:30 +0000 |
| commit | 33202706c2917603a32bf11021bf2640210459d4 (patch) | |
| tree | 1fb27d3bdf2bdfc962a80c57cc9ec030b8e75c1b | |
| parent | c3342e8eb3eaf4560210fd030383a940640648f2 (diff) | |
| download | emacs-33202706c2917603a32bf11021bf2640210459d4.tar.gz | |
(Ftry_completion): Use `check_obarray' if ALIST is a vector.
| -rw-r--r-- | src/ChangeLog | 10 | ||||
| -rw-r--r-- | src/minibuf.c | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 785ba4318e1..9a263f5ee91 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,11 +1,15 @@ +2006-12-16 Juanma Barranquero <lekktu@gmail.com> + + * minibuf.c (Ftry_completion): Use `check_obarray' if ALIST is a vector. + 2006-12-15 Eli Zaretskii <eliz@gnu.org> * emacs.c (USAGE3): Clarify documentation of --color. 2006-12-15 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> - * mac.c (wakeup_from_rne_enabled_p) [TARGET_API_MAC_CARBON]: New - variable. + * mac.c (wakeup_from_rne_enabled_p) [TARGET_API_MAC_CARBON]: + New variable. (ENABLE_WAKEUP_FROM_RNE, DISABLE_WAKEUP_FROM_RNE): New macros. [!MAC_OSX] (select): Use them. [MAC_OSX] (select_and_poll_event, sys_select): Likewise. @@ -20,7 +24,7 @@ * macterm.c (mac_query_char_extents) [USE_ATSUI]: Don't call ATSUGetGlyphBounds if not necessary. - (Vmac_atsu_font_table) [USE_ATSUI]: Remove Variable. + (Vmac_atsu_font_table) [USE_ATSUI]: Remove variable. (syms_of_macterm) [USE_ATSUI]: Don't defvar it. (fm_get_style_from_font, atsu_find_font_from_family_name) (atsu_find_font_family_name, mac_atsu_font_face_attributes) diff --git a/src/minibuf.c b/src/minibuf.c index 28f4a453ec7..c2df83253fd 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -1287,6 +1287,7 @@ is used to further constrain the set of candidates. */) tail = alist; if (type == 2) { + alist = check_obarray (alist); obsize = XVECTOR (alist)->size; bucket = XVECTOR (alist)->contents[index]; } |