[Emacs-diffs] trunk r113018: display.texi (Face Attributes): Refer to "Low-Level font" (not "Font Selection") in the explanation of :font attribute.

[Kenichi Handa]

------------------------------------------------------------
revno: 113018 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: K. Handa <address@hidden>
branch nick: trunk
timestamp: Tue 2013-06-18 00:05:41 +0900
message:
  display.texi (Face Attributes): Refer to "Low-Level font" (not "Font 
Selection") in the explanation of :font attribute.
modified:
  doc/lispref/ChangeLog          changelog-20091113204419-o5vbwnq5f7feedwu-6155
  doc/lispref/display.texi       
display.texi-20091113204419-o5vbwnq5f7feedwu-6172

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2013-06-13 22:24:52 +0000
+++ b/doc/lispref/ChangeLog     2013-06-17 15:04:50 +0000
@@ -1,3 +1,8 @@
+2013-06-17  Kenichi Handa  <address@hidden>
+
+       * display.texi (Face Attributes): Refer to "Low-Level font" (not
+       "Font Selection") in the explanation of :font attribute.
+
 2013-06-13  Stefan Monnier  <address@hidden>
 
        * loading.texi (Hooks for Loading): Don't document after-load-alist.

=== modified file 'doc/lispref/display.texi'
--- a/doc/lispref/display.texi  2013-04-06 07:39:48 +0000
+++ b/doc/lispref/display.texi  2013-06-17 15:04:50 +0000
@@ -2126,7 +2126,8 @@
 
 @item :font
 The font used to display the face.  Its value should be a font object.
address@hidden Selection}, for information about font objects.
address@hidden Font}, for information about font objects, font specs,
+and font entities.
 
 When specifying this attribute using @code{set-face-attribute}
 (@pxref{Attribute Functions}), you may also supply a font spec, a font
@@ -3260,7 +3261,9 @@
 properties are intermediate between a font object and a font spec:
 like a font object, and unlike a font spec, it refers to a single,
 specific font.  Unlike a font object, creating a font entity does not
-load the contents of that font into computer memory.
+load the contents of that font into computer memory.  Emacs may open
+multiple font objects of different sizes from a single font entity
+referring to a scalable font.
 
 @defun find-font font-spec &optional frame
 This function returns a font entity that best matches the font spec