diff --git a/core/core-ui.el b/core/core-ui.el index 169c9b27e..af1b2d257 100644 --- a/core/core-ui.el +++ b/core/core-ui.el @@ -200,11 +200,6 @@ or if the current buffer is read-only or not file-visiting." ;; Remove hscroll-margin in shells, otherwise it causes jumpiness (setq-hook! '(eshell-mode-hook term-mode-hook) hscroll-margin 0) -(when IS-MAC - ;; sane trackpad/mouse scroll settings - (setq mac-redisplay-dont-reset-vscroll t - mac-mouse-wheel-smooth-scroll nil)) - ;; ;;; Cursor @@ -307,33 +302,6 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original tool-bar-mode nil scroll-bar-mode nil) -(when! IS-MAC - ;; Curse Lion and its sudden but inevitable fullscreen mode! - ;; NOTE Meaningless to railwaycat's emacs-mac build - (setq ns-use-native-fullscreen nil) - - ;; Visit files opened outside of Emacs in existing frame, not a new one - (setq ns-pop-up-frames nil) - - ;; Sets `ns-transparent-titlebar' and `ns-appearance' frame parameters so - ;; window borders will match the enabled theme. - (and (or (daemonp) - (display-graphic-p)) - (require 'ns-auto-titlebar nil t) - (ns-auto-titlebar-mode +1)) - - ;; HACK On MacOS, disabling the menu bar makes MacOS treat Emacs as a - ;; non-application window -- which means it doesn't automatically capture - ;; focus when it is started, among other things. We enable menu-bar-lines - ;; there, but we still want it disabled in terminal frames because there - ;; it activates an ugly menu bar. - (add-hook! '(window-setup-hook after-make-frame-functions) - (defun doom-init-menu-bar-in-gui-frames-h (&optional frame) - "Re-enable menu-bar-lines in GUI frames." - (when-let (frame (or frame (selected-frame))) - (when (display-graphic-p frame) - (set-frame-parameter frame 'menu-bar-lines 1)))))) - ;; The native border "consumes" a pixel of the fringe on righter-most splits, ;; `window-divider' does not. Available since Emacs 25.1. (setq window-divider-default-places t diff --git a/core/core.el b/core/core.el index 3d08702eb..c1583c368 100644 --- a/core/core.el +++ b/core/core.el @@ -339,10 +339,6 @@ config.el instead." (unless IS-MAC (setq command-line-ns-option-alist nil)) (unless IS-LINUX (setq command-line-x-option-alist nil)) -;; Delete files to trash on macOS, as an extra layer of precaution against -;; accidentally deleting wanted files. -(setq delete-by-moving-to-trash IS-MAC) - ;; Adopt a sneaky garbage collection strategy of waiting until idle time to ;; collect; staving off the collector while the user is working. (setq gcmh-idle-delay 5 diff --git a/core/packages.el b/core/packages.el index ef801b215..fbfa46c80 100644 --- a/core/packages.el +++ b/core/packages.el @@ -32,8 +32,6 @@ (package! better-jumper :pin "6d240032ca213ccb3347e25f26c29b6822bf03a7") (package! dtrt-indent :pin "50c440c80e0d15303d8ab543bce4c56e9c2bf407") (package! helpful :pin "c0662aa07266fe204f4e6d72ccaa6af089400556") -(when IS-MAC - (package! ns-auto-titlebar :pin "60273e764bf8d95abc40dd2fdc23af87ea9ee33b")) (package! pcre2el :pin "0b5b2a2c173aab3fd14aac6cf5e90ad3bf58fa7d") (package! smartparens :pin "555626a43f9bb1985aa9a0eb675f2b88b29702c8") (package! so-long