aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorJan Djärv2012-10-07 19:47:41 +0200
committerJan Djärv2012-10-07 19:47:41 +0200
commitfcacb55843700a851e10402c2274d71d5b522349 (patch)
tree6d42342599bd458ba6839c674ceaca4971f28928 /lisp
parent8ad5b73b601fba3328b7e75ecd64c8cd0eef9fac (diff)
downloademacs-fcacb55843700a851e10402c2274d71d5b522349.tar.gz
emacs-fcacb55843700a851e10402c2274d71d5b522349.zip
* 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.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/term/ns-win.el7
2 files changed, 11 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 64b5d0828cd..718a9417cef 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
12012-10-07 Jan Djärv <jan.h.d@swipnet.se>
2
3 * term/ns-win.el (ns-read-file-name): Update declaration to match
4 nsfns.m.
5 (ns-respond-to-change-font): Change fontsize separatly so we are sure
6 it is set when font is acted upon.
7
12012-10-07 Fabián Ezequiel Gallina <fgallina@cuca> 82012-10-07 Fabián Ezequiel Gallina <fgallina@cuca>
2 9
3 Enhancements to indentation. 10 Enhancements to indentation.
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index c229ec14dd5..ebfa35f3f8c 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -448,7 +448,7 @@ Lines are highlighted according to `ns-input-line'."
448;; nsterm.m 448;; nsterm.m
449 449
450(declare-function ns-read-file-name "nsfns.m" 450(declare-function ns-read-file-name "nsfns.m"
451 (prompt &optional dir isLoad init)) 451 (prompt &optional dir mustmatch init dir_only_p))
452 452
453;;;; File handling. 453;;;; File handling.
454 454
@@ -633,8 +633,9 @@ This function has been overloaded in Nextstep.")
633`ns-input-fontsize' of new font." 633`ns-input-fontsize' of new font."
634 (interactive) 634 (interactive)
635 (modify-frame-parameters (selected-frame) 635 (modify-frame-parameters (selected-frame)
636 (list (cons 'font ns-input-font) 636 (list (cons 'fontsize ns-input-fontsize)))
637 (cons 'fontsize ns-input-fontsize))) 637 (modify-frame-parameters (selected-frame)
638 (list (cons 'font ns-input-font)))
638 (set-frame-font ns-input-font)) 639 (set-frame-font ns-input-font))
639 640
640 641