[Emacs-diffs] Changes to emacs/lisp/term/x-win.el

[Stefan Monnier]

Index: emacs/lisp/term/x-win.el
diff -c emacs/lisp/term/x-win.el:1.163 emacs/lisp/term/x-win.el:1.164
*** emacs/lisp/term/x-win.el:1.163      Thu Mar 13 01:27:57 2003
--- emacs/lisp/term/x-win.el    Sat May 24 12:13:06 2003
***************
*** 243,250 ****
        x-invocation-args (cdr x-invocation-args)))
  
  (defvar emacs-save-session-functions nil
!   "Functions to run when a save-session event occurs.
! The functions does not get any argument.
  Functions can return non-nil to inform the session manager that the
  window system shutdown should be aborted.
  
--- 243,250 ----
        x-invocation-args (cdr x-invocation-args)))
  
  (defvar emacs-save-session-functions nil
!   "Special hook run when a save-session event occurs.
! The functions do not get any argument.
  Functions can return non-nil to inform the session manager that the
  window system shutdown should be aborted.
  
***************
*** 1159,1171 ****
  
  ;;;; Function keys
  
- (defun iconify-or-deiconify-frame ()
-   "Iconify the selected frame, or deiconify if it's currently an icon."
-   (interactive)
-   (if (eq (cdr (assq 'visibility (frame-parameters))) t)
-       (iconify-frame)
-     (make-frame-visible)))
- 
  (substitute-key-definition 'suspend-emacs 'iconify-or-deiconify-frame
                           global-map)
  
--- 1159,1164 ----
***************
*** 2367,2377 ****
  ;; Don't show the frame name; that's redundant with X.
  (setq-default mode-line-frame-identification "  ")
  
! ;;; Motif direct handling of f10 wasn't working right,
! ;;; So temporarily we've turned it off in lwlib-Xm.c
! ;;; and turned the Emacs f10 back on.
! ;;; ;; Motif normally handles f10 itself, so don't try to handle it a second 
time.
! ;;; (if (featurep 'motif)
! ;;;     (global-set-key [f10] 'ignore))
  
  ;;; x-win.el ends here
--- 2360,2373 ----
  ;; Don't show the frame name; that's redundant with X.
  (setq-default mode-line-frame-identification "  ")
  
! ;; Motif direct handling of f10 wasn't working right,
! ;; So temporarily we've turned it off in lwlib-Xm.c
! ;; and turned the Emacs f10 back on.
! ;; ;; Motif normally handles f10 itself, so don't try to handle it a second 
time.
! ;; (if (featurep 'motif)
! ;;     (global-set-key [f10] 'ignore))
! 
! ;; Turn on support for mouse wheels.
! (mouse-wheel-mode 1)
  
  ;;; x-win.el ends here