Merge remote-tracking branch 'origin/main'

This commit is contained in:
Maciej 2023-07-11 07:41:02 +03:00
commit 0942816867
Signed by: maciej
GPG key ID: 28243AF437E32F99
2 changed files with 12 additions and 2 deletions

View file

@ -84,9 +84,9 @@
((>= 1920 (x-display-pixel-height)) ((>= 1920 (x-display-pixel-height))
(set-font +custom-font +custom-font-size)) (set-font +custom-font +custom-font-size))
;; 4K screen on Windows ;; 4K screen on Windows or Linux
((>= 2160 (x-display-pixel-height)) ((>= 2160 (x-display-pixel-height))
(set-font +custom-font (+ +custom-font-size 6))) (set-font +custom-font (- +custom-font-size 5)))
;; Default ;; Default
(t (set-font +custom-font (+ +custom-font-size 2))))) (t (set-font +custom-font (+ +custom-font-size 2)))))

View file

@ -65,6 +65,16 @@
;;;;;;;;; Mac-specific config ;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;; Mac-specific config ;;;;;;;;;;;;;;;;;;;;;
(if IS-GNU (if IS-GNU
(progn (progn
;;;; Save and undo
(define-key +custom-keys-mode-map (kbd "s-s") 'save-buffer)
(define-key +custom-keys-mode-map (kbd "s-z") 'undo)
(define-key +custom-keys-mode-map (kbd "s-a") 'mark-whole-buffer)
;;;;;;;; Copy and paste bindings ;;;;;;;;;;;;;;;;;;
(define-key +custom-keys-mode-map (kbd "s-x") 'kill-region)
(define-key +custom-keys-mode-map (kbd "s-v") 'yank)
(define-key +custom-keys-mode-map (kbd "s-c") 'kill-ring-save)
;;;;;;;;; Linux Ergo bindings (fix) ;;;;;;;;;;;;;;;;;; ;;;;;;;;; Linux Ergo bindings (fix) ;;;;;;;;;;;;;;;;;;
(define-key +custom-keys-mode-map (kbd "C-<right>") 'end-of-line) (define-key +custom-keys-mode-map (kbd "C-<right>") 'end-of-line)
(define-key +custom-keys-mode-map (kbd "C-<left>") 'beginning-of-line) (define-key +custom-keys-mode-map (kbd "C-<left>") 'beginning-of-line)