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

[Miles Bader]

Index: emacs/lisp/term/mac-win.el
diff -c emacs/lisp/term/mac-win.el:1.8.2.1 emacs/lisp/term/mac-win.el:1.8.2.2
*** emacs/lisp/term/mac-win.el:1.8.2.1  Fri Apr  4 01:20:37 2003
--- emacs/lisp/term/mac-win.el  Tue Oct 14 19:42:15 2003
***************
*** 1,6 ****
  ;;; mac-win.el --- support for "Macintosh windows"
  
! ;; Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
  
  ;; Author: Andrew Choi <address@hidden>
  
--- 1,6 ----
  ;;; mac-win.el --- support for "Macintosh windows"
  
! ;; Copyright (C) 1999, 2000, 2002, 2003  Free Software Foundation, Inc.
  
  ;; Author: Andrew Choi <address@hidden>
  
***************
*** 172,184 ****
          '(lambda ()
             (defvar mac-ready-for-drag-n-drop t)))
  
- (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)))
- 
  ; Define constant values to be set to mac-keyboard-text-encoding
  (defconst kTextEncodingMacRoman 0)
  (defconst kTextEncodingISOLatin1 513 "0x201")
--- 172,177 ----
***************
*** 232,242 ****
  (if (string= default-directory "/")
      (cd "~"))
  
! (unless (eq system-type 'darwin)
!   ;; Tell Emacs to use pipes instead of pty's for processes because the
!   ;; latter sometimes lose characters.  Pty support is compiled in since
!   ;; ange-ftp will not work without it.
!   (setq process-connection-type nil))
  
  ;; Assume that fonts are always scalable on the Mac.  This sometimes
  ;; results in characters with jagged edges.  However, without it,
--- 225,234 ----
  (if (string= default-directory "/")
      (cd "~"))
  
! ;; Tell Emacs to use pipes instead of pty's for processes because the
! ;; latter sometimes lose characters.  Pty support is compiled in since
! ;; ange-ftp will not work without it.
! (setq process-connection-type nil)
  
  ;; Assume that fonts are always scalable on the Mac.  This sometimes
  ;; results in characters with jagged edges.  However, without it,
***************
*** 249,258 ****
                           global-map)
  
  ;; Support mouse-wheel scrolling
! (autoload 'mwheel-scroll "mwheel")
! (global-set-key [mouse-wheel] 'mwheel-scroll)
! (global-set-key [C-mouse-wheel] 'mwheel-scroll)
! (global-set-key [S-mouse-wheel] 'mwheel-scroll)
  
  ;; (prefer-coding-system 'mac-roman)
  
--- 241,247 ----
                           global-map)
  
  ;; Support mouse-wheel scrolling
! (mouse-wheel-mode 1)
  
  ;; (prefer-coding-system 'mac-roman)
  
***************
*** 1028,1031 ****
--- 1017,1021 ----
    "The list of X colors from the `rgb.txt' file.
  XConsortium: rgb.txt,v 10.41 94/02/20 18:39:36 rws Exp")
  
+ ;;; arch-tag: 71dfcd14-cde8-4d66-b05c-85ec94fb23a6
  ;;; mac-win.el ends here