diff options
| author | Stefan Monnier | 2006-10-10 14:22:46 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2006-10-10 14:22:46 +0000 |
| commit | de9855d5a3ca490f67933aa1ae5a88f571199626 (patch) | |
| tree | 3216fdea06dada1c4b73e13204de648f688b85af /src | |
| parent | 1b17f81a8b602403202c10c0ecbaf275794c543e (diff) | |
| download | emacs-de9855d5a3ca490f67933aa1ae5a88f571199626.tar.gz emacs-de9855d5a3ca490f67933aa1ae5a88f571199626.zip | |
(syms_of_xmenu): Use Ffset rather than Fdefalias, since
Fdefalias is not declared in any *.h file.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 20 | ||||
| -rw-r--r-- | src/xmenu.c | 3 |
2 files changed, 13 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 646fb439843..aa603feab4b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2006-10-10 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * xmenu.c (syms_of_xmenu): Use Ffset rather than Fdefalias, since | ||
| 4 | Fdefalias is not declared in any *.h file. | ||
| 5 | |||
| 1 | 2006-10-09 Chong Yidong <cyd@stupidchicken.com> | 6 | 2006-10-09 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 7 | ||
| 3 | * dispnew.c (sit_for): Sit forever if TIMEOUT is t. | 8 | * dispnew.c (sit_for): Sit forever if TIMEOUT is t. |
| @@ -11,14 +16,14 @@ | |||
| 11 | 16 | ||
| 12 | 2006-10-08 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 17 | 2006-10-08 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
| 13 | 18 | ||
| 14 | * macterm.c (mac_draw_image_string, mac_draw_image_string_16): Add | 19 | * macterm.c (mac_draw_image_string, mac_draw_image_string_16): |
| 15 | argument OVERSTRIKE_P. | 20 | Add argument OVERSTRIKE_P. |
| 16 | (mac_draw_string_common, mac_draw_image_string_cg): Likewise. | 21 | (mac_draw_string_common, mac_draw_image_string_cg): Likewise. |
| 17 | Support overstrike. | 22 | Support overstrike. |
| 18 | (mac_draw_string, mac_draw_string_16): Remove functions. | 23 | (mac_draw_string, mac_draw_string_16): Remove functions. |
| 19 | (x_draw_glyph_string_foreground): Use overstrike when needed. | 24 | (x_draw_glyph_string_foreground): Use overstrike when needed. |
| 20 | (x_draw_composite_glyph_string_foreground): Likewise. Use | 25 | (x_draw_composite_glyph_string_foreground): Likewise. |
| 21 | mac_draw_image_string_16 instead of mac_draw_string_16. | 26 | Use mac_draw_image_string_16 instead of mac_draw_string_16. |
| 22 | (mac_load_query_font): Rename from XLoadQueryFont. Take argument F | 27 | (mac_load_query_font): Rename from XLoadQueryFont. Take argument F |
| 23 | instead of DPY. All uses changed. Don't save/restore font. | 28 | instead of DPY. All uses changed. Don't save/restore font. |
| 24 | 29 | ||
| @@ -111,8 +116,8 @@ | |||
| 111 | 116 | ||
| 112 | 2006-09-24 Eli Zaretskii <eliz@gnu.org> | 117 | 2006-09-24 Eli Zaretskii <eliz@gnu.org> |
| 113 | 118 | ||
| 114 | * makefile.w32-in ($(BLD)/fns.$(O), $(BLD)/w32proc.$(O)): Depend | 119 | * makefile.w32-in ($(BLD)/fns.$(O), $(BLD)/w32proc.$(O)): |
| 115 | on nt/inc/langinfo.h and nt/inc/nl_types.h. | 120 | Depend on nt/inc/langinfo.h and nt/inc/nl_types.h. |
| 116 | 121 | ||
| 117 | * w32proc.c (nl_langinfo): New function. | 122 | * w32proc.c (nl_langinfo): New function. |
| 118 | 123 | ||
| @@ -294,8 +299,7 @@ | |||
| 294 | 299 | ||
| 295 | 2006-09-15 David Kastrup <dak@gnu.org> | 300 | 2006-09-15 David Kastrup <dak@gnu.org> |
| 296 | 301 | ||
| 297 | * Makefile.in (keymap.o): Add "keymap.h" and "window.h" | 302 | * Makefile.in (keymap.o): Add "keymap.h" and "window.h" dependencies. |
| 298 | dependencies. | ||
| 299 | 303 | ||
| 300 | * keymap.c: include "window.h". | 304 | * keymap.c: include "window.h". |
| 301 | (Fcommand_remapping): New optional POSITION argument. | 305 | (Fcommand_remapping): New optional POSITION argument. |
diff --git a/src/xmenu.c b/src/xmenu.c index 63dfb5102bd..d049fb99c66 100644 --- a/src/xmenu.c +++ b/src/xmenu.c | |||
| @@ -3776,8 +3776,7 @@ syms_of_xmenu () | |||
| 3776 | 3776 | ||
| 3777 | #if defined (USE_GTK) || defined (USE_X_TOOLKIT) | 3777 | #if defined (USE_GTK) || defined (USE_X_TOOLKIT) |
| 3778 | defsubr (&Smenu_bar_open); | 3778 | defsubr (&Smenu_bar_open); |
| 3779 | Fdefalias (intern ("accelerate-menu"), intern (Smenu_bar_open.symbol_name), | 3779 | Ffset (intern ("accelerate-menu"), intern (Smenu_bar_open.symbol_name)); |
| 3780 | Qnil); | ||
| 3781 | #endif | 3780 | #endif |
| 3782 | 3781 | ||
| 3783 | #ifdef HAVE_MENUS | 3782 | #ifdef HAVE_MENUS |