[Emacs-diffs] /srv/bzr/emacs/trunk r103186: font.c (Ffont_get): Do not cache :otf value.

[Kenichi Handa]

------------------------------------------------------------
revno: 103186 [merge]
committer: Kenichi Handa <address@hidden>
branch nick: trunk
timestamp: Tue 2011-02-08 15:57:32 +0900
message:
  font.c (Ffont_get): Do not cache :otf value.
modified:
  lisp/emacs-lisp/cl-loaddefs.el
  lisp/ibuffer.el
  src/ChangeLog
  src/font.c

=== modified file 'lisp/emacs-lisp/cl-loaddefs.el'
--- a/lisp/emacs-lisp/cl-loaddefs.el    2011-01-28 16:58:04 +0000
+++ b/lisp/emacs-lisp/cl-loaddefs.el    2011-02-08 06:54:37 +0000
@@ -282,7 +282,7 @@
 ;;;;;;  do-all-symbols do-symbols dotimes dolist do* do loop return-from
 ;;;;;;  return block etypecase typecase ecase case load-time-value
 ;;;;;;  eval-when destructuring-bind function* defmacro* defun* gentemp
-;;;;;;  gensym) "cl-macs" "cl-macs.el" "8b2ce9c2ec0e273606bb37c333c4bdde")
+;;;;;;  gensym) "cl-macs" "cl-macs.el" "0904b956872432ae7cc5fa9abcefce63")
 ;;; Generated autoloads from cl-macs.el
 
 (autoload 'gensym "cl-macs" "\
@@ -389,7 +389,7 @@
 
 (autoload 'return-from "cl-macs" "\
 Return from the block named NAME.
-This jump out to the innermost enclosing `(block NAME ...)' form,
+This jumps out to the innermost enclosing `(block NAME ...)' form,
 returning RESULT from that form (or nil if RESULT is omitted).
 This is compatible with Common Lisp, but note that `defun' and
 `defmacro' do not create implicit blocks as they do in Common Lisp.

=== modified file 'lisp/ibuffer.el'
--- a/lisp/ibuffer.el   2011-01-28 16:58:04 +0000
+++ b/lisp/ibuffer.el   2011-02-08 06:54:37 +0000
@@ -2638,7 +2638,7 @@
 ;;;;;;  ibuffer-backward-filter-group ibuffer-forward-filter-group
 ;;;;;;  ibuffer-toggle-filter-group ibuffer-mouse-toggle-filter-group
 ;;;;;;  ibuffer-interactive-filter-by-mode ibuffer-mouse-filter-by-mode
-;;;;;;  ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" 
"f163e17664a89a6f0aa2b15bfaaa65a4")
+;;;;;;  ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" 
"eb3de21aef70e4ca75f611f1c3c56aa1")
 ;;; Generated autoloads from ibuf-ext.el
 
 (autoload 'ibuffer-auto-mode "ibuf-ext" "\

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-02-07 06:18:23 +0000
+++ b/src/ChangeLog     2011-02-08 06:56:57 +0000
@@ -1,3 +1,7 @@
+2011-02-08  Kenichi Handa  <address@hidden>
+
+       * font.c (Ffont_get): Do not cache :otf value.
+
 2011-02-07  Paul Eggert  <address@hidden>
 
        conform to C89 pointer rules

=== modified file 'src/font.c'
--- a/src/font.c        2011-02-05 10:20:15 +0000
+++ b/src/font.c        2011-02-08 06:56:57 +0000
@@ -3982,7 +3982,6 @@
        val = fontp->driver->otf_capability (fontp);
       else
        val = Fcons (Qnil, Qnil);
-      font_put_extra (font, QCotf, val);
     }
   else
     val = Fcdr (val);