Merge from emacs-24; up to 2012-04-22T13:58:00Z!cyd@gnu.org

[bpt/emacs.git] / lisp / menu-bar.el

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 75a2d70..1f57601 100644 (file)
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1,6 +1,6 @@
 ;;; menu-bar.el --- define a default menu bar
 
-;; Copyright (C) 1993-1995, 2000-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1993-1995, 2000-2012  Free Software Foundation, Inc.
 
 ;; Author: RMS
 ;; Maintainer: FSF
@@ -101,13 +101,13 @@
                   :help ,(purecopy "Make selected window fill whole frame")))
 
     (define-key menu [new-window-on-right]
-      `(menu-item ,(purecopy "New Window on Right") split-window-side-by-side
+      `(menu-item ,(purecopy "New Window on Right") split-window-right
                   :enable (and (menu-bar-menu-frame-live-and-visible-p)
                                (menu-bar-non-minibuffer-window-p))
                   :help ,(purecopy "Make new window on right of selected one")))
 
     (define-key menu [new-window-below]
-      `(menu-item ,(purecopy "New Window Below") split-window-above-each-other
+      `(menu-item ,(purecopy "New Window Below") split-window-below
                   :enable (and (menu-bar-menu-frame-live-and-visible-p)
                                (menu-bar-non-minibuffer-window-p))
                   :help ,(purecopy "Make new window below selected one")))
@@ -116,21 +116,21 @@
       menu-bar-separator)
 
     (define-key menu [ps-print-region]
-      `(menu-item ,(purecopy "Postscript Print Region (B+W)") ps-print-region
+      `(menu-item ,(purecopy "PostScript Print Region (B+W)") ps-print-region
                   :enable mark-active
                   :help ,(purecopy "Pretty-print marked region in black and white to PostScript printer")))
     (define-key menu [ps-print-buffer]
-      `(menu-item ,(purecopy "Postscript Print Buffer (B+W)") ps-print-buffer
+      `(menu-item ,(purecopy "PostScript Print Buffer (B+W)") ps-print-buffer
                   :enable (menu-bar-menu-frame-live-and-visible-p)
                   :help ,(purecopy "Pretty-print current buffer in black and white to PostScript printer")))
     (define-key menu [ps-print-region-faces]
-      `(menu-item ,(purecopy "Postscript Print Region")
+      `(menu-item ,(purecopy "PostScript Print Region")
                   ps-print-region-with-faces
                   :enable mark-active
                   :help ,(purecopy
                           "Pretty-print marked region to PostScript printer")))
     (define-key menu [ps-print-buffer-faces]
-      `(menu-item ,(purecopy "Postscript Print Buffer")
+      `(menu-item ,(purecopy "PostScript Print Buffer")
                   ps-print-buffer-with-faces
                   :enable (menu-bar-menu-frame-live-and-visible-p)
                   :help ,(purecopy "Pretty-print current buffer to PostScript printer")))
@@ -445,7 +445,7 @@
     (define-key menu [props]
       `(menu-item ,(purecopy "Text Properties") facemenu-menu))
 
-    ;; ns-win.el said: Add spell for platorm consistency.
+    ;; ns-win.el said: Add spell for platform consistency.
     (if (featurep 'ns)
         (define-key menu [spell]
           `(menu-item ,(purecopy "Spell") ispell-menu-map)))
@@ -683,29 +683,10 @@ by \"Save Options\" in Custom buffers.")
 (defun menu-set-font ()
   "Interactively select a font and make it the default."
   (interactive)
-  (let ((font (if (fboundp 'x-select-font)
-                 (x-select-font)
-               (mouse-select-font)))
-       spec)
-    (when font
-      ;; Be careful here: when set-face-attribute is called for the
-      ;; :font attribute, Emacs tries to guess the best matching font
-      ;; by examining the other face attributes (Bug#2476).
-      (set-face-attribute 'default (selected-frame)
-                         :width 'normal
-                         :weight 'normal
-                         :slant 'normal
-                         :font font)
-      (let ((font-object (face-attribute 'default :font)))
-       (dolist (f (frame-list))
-         (and (not (eq f (selected-frame)))
-              (display-graphic-p f)
-              (set-face-attribute 'default f :font font-object)))
-       (set-face-attribute 'default t :font font-object))
-      (setq spec (list (list t (face-attr-construct 'default))))
-      (put 'default 'customized-face spec)
-      (custom-push-theme 'theme-face 'default 'user 'set spec)
-      (put 'default 'face-modified nil))))
+  (set-frame-font (if (fboundp 'x-select-font)
+                     (x-select-font)
+                   (mouse-select-font))
+                 nil t))
 
 (defun menu-bar-options-save ()
   "Save current values of Options menu items using Custom."