emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add EMACS26+ & EMACS27+ constants

Browse source
This commit is contained in:
Henrik Lissner 2018-03-24 04:40:24 -04:00
parent b5db4f1fb6
commit 5eadfdc880
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
4 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/core-lib.el
View file

@ -6,7 +6,7 @@
(require 'map)) (require 'map))
(eval-and-compile (eval-and-compile
(when (version< emacs-version "26") (unless EMACS26+
(with-no-warnings (with-no-warnings
(defalias 'if-let* #'if-let) (defalias 'if-let* #'if-let)
(defalias 'when-let* #'when-let)))) (defalias 'when-let* #'when-let))))

3
core/core.el
View file

@ -56,6 +56,9 @@ Use this for files that change often, like cache files.")
(defvar doom-packages-dir (concat doom-local-dir "packages/") (defvar doom-packages-dir (concat doom-local-dir "packages/")
"Where package.el and quelpa plugins (and their caches) are stored.") "Where package.el and quelpa plugins (and their caches) are stored.")
(defconst EMACS26+ (not (version< emacs-version "26")))
(defconst EMACS27+ (not (version< emacs-version "27")))
;;; ;;;
;; UTF-8 as the default coding system ;; UTF-8 as the default coding system

4
modules/feature/popup/autoload.el
View file

@ -1,6 +1,6 @@
;;; feature/popup/autoload.el -*- lexical-binding: t; -*- ;;; feature/popup/autoload.el -*- lexical-binding: t; -*-
(defvar +popup--populate-wparams (version< emacs-version "26.1")) (defvar +popup--populate-wparams (not EMACS26+))
(defun +popup--remember (windows) (defun +popup--remember (windows)
"Remember WINDOWS (a list of windows) for later restoration." "Remember WINDOWS (a list of windows) for later restoration."
@ -423,7 +423,7 @@ prevent the popup(s) from messing up the UI (or vice versa)."
;; Popup actions ;; Popup actions
;; ;;
(when (version< emacs-version "26") (unless EMACS26+
(defvar window-sides-reversed nil) (defvar window-sides-reversed nil)
(defun window--sides-reverse-on-frame-p (frame) (defun window--sides-reverse-on-frame-p (frame)

2
modules/feature/version-control/config.el
View file

@ -20,7 +20,7 @@
(def-package! smerge-mode (def-package! smerge-mode
:hook (find-file . +vcs|enable-smerge-mode-maybe) :hook (find-file . +vcs|enable-smerge-mode-maybe)
:config :config
(when (version< emacs-version "26") (unless EMACS26+
(with-no-warnings (with-no-warnings
(defalias #'smerge-keep-upper #'smerge-keep-mine) (defalias #'smerge-keep-upper #'smerge-keep-mine)
(defalias #'smerge-keep-lower #'smerge-keep-other) (defalias #'smerge-keep-lower #'smerge-keep-other)