[Emacs-diffs] Changes to emacs/lisp/mouse.el

[Richard M. Stallman]

Index: emacs/lisp/mouse.el
diff -c emacs/lisp/mouse.el:1.240 emacs/lisp/mouse.el:1.241
*** emacs/lisp/mouse.el:1.240   Wed Apr 10 11:04:19 2002
--- emacs/lisp/mouse.el Wed May 29 12:36:55 2002
***************
*** 2175,2185 ****
  (defun mouse-set-font (&rest fonts)
    "Select an emacs font from a list of known good fonts and fontsets."
    (interactive
!    (and (display-multi-font-p)
!       (x-popup-menu
!        last-nonmenu-event
!        ;; Append list of fontsets currently defined.
!        (append x-fixed-font-alist (list (generate-fontset-menu))))))
    (if fonts
        (let (font)
        (while fonts
--- 2175,2186 ----
  (defun mouse-set-font (&rest fonts)
    "Select an emacs font from a list of known good fonts and fontsets."
    (interactive
!    (progn (unless (display-multi-font-p)
!           (error "Cannot change fonts on this display"))
!         (x-popup-menu
!          last-nonmenu-event
!          ;; Append list of fontsets currently defined.
!          (append x-fixed-font-alist (list (generate-fontset-menu))))))
    (if fonts
        (let (font)
        (while fonts
***************
*** 2191,2198 ****
            (error
             (setq fonts (cdr fonts)))))
        (if (null font)
!           (error "Font not found")))
!     (message "Cannot change fonts on this display")))
  
  ;;; Bindings for mouse commands.
  
--- 2192,2198 ----
            (error
             (setq fonts (cdr fonts)))))
        (if (null font)
!           (error "Font not found")))))
  
  ;;; Bindings for mouse commands.