[Emacs-diffs] /srv/bzr/emacs/trunk r110428: * lisp/term/ns-win.el (ns-read-file-name): Update declaration to match

[Jan D.]

------------------------------------------------------------
revno: 110428
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2012-10-07 19:47:41 +0200
message:
  * lisp/term/ns-win.el (ns-read-file-name): Update declaration to match
  nsfns.m.
  (ns-respond-to-change-font): Change fontsize separatly so we are sure
  it is set when font is acted upon.
modified:
  lisp/ChangeLog
  lisp/term/ns-win.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-07 16:13:52 +0000
+++ b/lisp/ChangeLog    2012-10-07 17:47:41 +0000
@@ -1,3 +1,10 @@
+2012-10-07  Jan Djärv  <address@hidden>
+
+       * term/ns-win.el (ns-read-file-name): Update declaration to match
+       nsfns.m.
+       (ns-respond-to-change-font): Change fontsize separatly so we are sure
+       it is set when font is acted upon.
+
 2012-10-07  Fabián Ezequiel Gallina  <address@hidden>
 
        Enhancements to indentation.

=== modified file 'lisp/term/ns-win.el'
--- a/lisp/term/ns-win.el       2012-09-30 13:43:47 +0000
+++ b/lisp/term/ns-win.el       2012-10-07 17:47:41 +0000
@@ -448,7 +448,7 @@
 ;; nsterm.m
 
 (declare-function ns-read-file-name "nsfns.m"
-                 (prompt &optional dir isLoad init))
+                 (prompt &optional dir mustmatch init dir_only_p))
 
 ;;;; File handling.
 
@@ -633,8 +633,9 @@
 `ns-input-fontsize' of new font."
   (interactive)
   (modify-frame-parameters (selected-frame)
-                           (list (cons 'font ns-input-font)
-                                 (cons 'fontsize ns-input-fontsize)))
+                           (list (cons 'fontsize ns-input-fontsize)))
+  (modify-frame-parameters (selected-frame)
+                           (list (cons 'font ns-input-font)))
   (set-frame-font ns-input-font))