(font_find_for_lface): If registry is NULL, try iso8859-1 and ascii-0.

[bpt/emacs.git] / src / ChangeLog.10

diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index 577f1be..c452dc8 100644 (file)
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -12320,7 +12320,7 @@
 
        * dispnew.c (margin_glyphs_to_reserve): Don't use ncols_scale_factor.
 
-2004-10-28  Will  <will@glozer.net>
+2004-10-28  Will Glozer  <will@glozer.net>
 
        * macterm.c: Allow user to assign key modifiers to the Mac Option
        key via a 'mac-option-modifier' variable.
@@ -15517,7 +15517,7 @@
        line is drawn.
        (XTset_terminal_window): Add static.
        (x_make_frame_visible): Add UNBLOCK_INPUT.
-       (x_free_frame_resources): New funcion (from xterm.c).
+       (x_free_frame_resources): New function (from xterm.c).
        (XTread_socket): Call handle_tool_bar_click if mouse up/down event
        occurs in tool bar area.
        (mac_initialize_display_info): Remove dpyinfo->n_cbits.
@@ -16497,8 +16497,8 @@
 
 2003-12-01  Kenichi Handa  <handa@m17n.org>
 
-       * composite.c (syms_of_composite): Don't make the compostion hash
-       table week.
+       * composite.c (syms_of_composite): Don't make the composition hash
+       table weak.
 
 2003-11-30  Luc Teirlinck  <teirllm@auburn.edu>
 
@@ -27921,10 +27921,10 @@ See ChangeLog.9 for earlier changes.
 
   This file is part of GNU Emacs.
 
-  GNU Emacs is free software; you can redistribute it and/or modify
+  GNU Emacs is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 3, or (at your option)
-  any later version.
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -27932,8 +27932,6 @@ See ChangeLog.9 for earlier changes.
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with GNU Emacs; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  Boston, MA 02110-1301, USA.
+  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; arch-tag: 5dcc435f-4038-4141-b3bf-5be51cd76bd4