summaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/init-mac.el29
1 files changed, 16 insertions, 13 deletions
diff --git a/lisp/init-mac.el b/lisp/init-mac.el
index 1b44ed8..cbd1f81 100644
--- a/lisp/init-mac.el
+++ b/lisp/init-mac.el
@@ -2,20 +2,23 @@
;;; Commentary:
;;; Code:
-;; configure modifiers
-(setq mac-option-modifier 'super)
+;; use command as meta
(setq mac-command-modifier 'meta)
-(setq ns-function-modifier 'hyper)
-
-;; Norwegian mac-keyboard
-(define-key key-translation-map (kbd "s-8") (kbd "["))
-(define-key key-translation-map (kbd "s-(") (kbd "{"))
-(define-key key-translation-map (kbd "s-9") (kbd "]"))
-(define-key key-translation-map (kbd "s-)") (kbd "}"))
-(define-key key-translation-map (kbd "s-7") (kbd "|"))
-(define-key key-translation-map (kbd "s-/") (kbd "\\"))
-(define-key key-translation-map (kbd "M-s-7") (kbd "M-|"))
-(define-key key-translation-map (kbd "s-ยจ") (kbd "~"))
+
+;; keyboard configuration when not using mac port
+(unless (featurep 'mac)
+ ;; configure modifiers
+ (setq mac-option-modifier 'super)
+ (setq ns-function-modifier 'hyper)
+
+ ;; Norwegian mac-keyboard
+ (define-key key-translation-map (kbd "s-8") (kbd "["))
+ (define-key key-translation-map (kbd "s-(") (kbd "{"))
+ (define-key key-translation-map (kbd "s-9") (kbd "]"))
+ (define-key key-translation-map (kbd "s-)") (kbd "}"))
+ (define-key key-translation-map (kbd "s-7") (kbd "|"))
+ (define-key key-translation-map (kbd "s-/") (kbd "\\"))
+ (define-key key-translation-map (kbd "M-s-7") (kbd "M-|")))
;; disable native tabs
(setq mac-frame-tabbing nil)