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

merge: pull request #7389 from hpfr/misc

Browse source
This commit is contained in:
Henrik Lissner 2023-09-06 14:28:57 +02:00 • committed by GitHub
commit af5add0e9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 44 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/lib/ui.el
View file

@ -177,9 +177,13 @@ Use `winner-undo' to undo this. Alternatively, use
OPACITY is an integer between 0 to 100, inclusive."
(interactive
(list (read-number "Opacity (0-100): "
(or (frame-parameter nil 'alpha)
(or (frame-parameter
nil (if (> emacs-major-version 28)
'alpha-background 'alpha))
100))))
(set-frame-parameter nil 'alpha opacity))
(set-frame-parameter nil (if (> emacs-major-version 28)
'alpha-background 'alpha)
opacity))
(defvar doom--narrowed-base-buffer nil)
;;;###autoload

4
modules/completion/vertico/config.el
View file

@ -253,6 +253,7 @@ orderless."
(set-popup-rule! "^\\*Embark Export:" :size 0.35 :ttl 0 :quit nil)
(after! which-key
(defadvice! +vertico--embark-which-key-prompt-a (fn &rest args)
"Hide the which-key indicator immediately when using the completing-read prompter."
:around #'embark-completing-read-prompter
@ -260,7 +261,8 @@ orderless."
(let ((embark-indicators
(remq #'embark-which-key-indicator embark-indicators)))
(apply fn args)))
(cl-nsubstitute #'+vertico-embark-which-key-indicator #'embark-mixed-indicator embark-indicators)
(cl-nsubstitute #'+vertico-embark-which-key-indicator #'embark-mixed-indicator embark-indicators))
;; add the package! target finder before the file target finder,
;; so we don't get a false positive match.
(let ((pos (or (cl-position

8
modules/config/default/+emacs-bindings.el
View file

@ -126,6 +126,9 @@
:desc "Search .emacs.d" "e" #'+default/search-emacsd
:desc "Locate file" "f" #'+lookup/file
:desc "Jump to symbol" "i" #'imenu
:desc "Jump to symbol in open buffers" "I"
(cond ((modulep! :completion vertico) #'consult-imenu-multi)
((modulep! :completion helm) #'helm-imenu-in-all-buffers))
:desc "Jump to visible link" "l" #'link-hint-open-link
:desc "Jump to link" "L" #'ffap-menu
:desc "Jump to bookmark" "m" #'bookmark-jump
@ -145,7 +148,10 @@
;;; <leader> i --- insert
(:prefix-map ("i" . "insert")
:desc "Emoji" "e" #'emojify-insert-emoji
(:when (> emacs-major-version 28)
:desc "Emoji" "e" #'emoji-search)
(:when (modulep! :ui emoji)
:desc "Emoji" "e" #'emojify-insert-emoji)
:desc "Current file name" "f" #'+default/insert-file-path
:desc "Current file path" "F" (cmd!! #'+default/insert-file-path t)
:desc "Snippet" "s" #'yas-insert-snippet

8
modules/config/default/+evil-bindings.el
View file

@ -496,7 +496,10 @@
;;; <leader> i --- insert
(:prefix-map ("i" . "insert")
:desc "Emoji" "e" #'emojify-insert-emoji
(:when (> emacs-major-version 28)
:desc "Emoji" "e" #'emoji-search)
(:when (modulep! :ui emoji)
:desc "Emoji" "e" #'emojify-insert-emoji)
:desc "Current file name" "f" #'+default/insert-file-path
:desc "Current file path" "F" (cmd!! #'+default/insert-file-path t)
:desc "Evil ex path" "p" (cmd! (evil-ex "R!echo "))
@ -736,6 +739,9 @@
:desc "Search .emacs.d" "e" #'+default/search-emacsd
:desc "Locate file" "f" #'locate
:desc "Jump to symbol" "i" #'imenu
:desc "Jump to symbol in open buffers" "I"
(cond ((modulep! :completion vertico) #'consult-imenu-multi)
((modulep! :completion helm) #'helm-imenu-in-all-buffers))
:desc "Jump to visible link" "l" #'link-hint-open-link
:desc "Jump to link" "L" #'ffap-menu
:desc "Jump list" "j" #'evil-show-jumps

6
modules/editor/file-templates/autoload.el
View file

@ -15,9 +15,9 @@ PRED can either be a regexp string or a major mode symbol. PLIST may contain
these properties:
:when FUNCTION
Provides a secondary predicate. This function takes no arguments and is
executed from within the target buffer. If it returns nil, this rule will be
skipped over.
Provides a secondary predicate. This function takes the filename as an
argument and is executed from within the target buffer. If it returns nil,
this rule will be skipped over.
:trigger STRING|FUNCTION
If a string, this is the yasnippet trigger keyword used to trigger the
target snippet.

1
modules/lang/javascript/config.el
View file

@ -299,7 +299,6 @@ to tide."
"e" #'skewer-html-eval-tag))
;;;###package npm-mode
(use-package! npm-mode
:hook ((js-mode typescript-mode) . npm-mode)
:config

2
modules/lang/org/autoload/org-capture.el
View file

@ -84,7 +84,7 @@ If it is an absolute path return `+org-capture-todo-file' verbatim."
;;;###autoload
(defun +org-capture-notes-file ()
"Expand `+org-capture-notes-file' from `org-directory'.
If it is an absolute path return `+org-capture-todo-file' verbatim."
If it is an absolute path return `+org-capture-notes-file' verbatim."
(expand-file-name +org-capture-notes-file org-directory))
(defun +org--capture-local-root (path)

2
modules/lang/org/contrib/present.el
View file

@ -22,7 +22,7 @@ headings as titles, and you have more freedom to place them wherever you like.")
(use-package! org-re-reveal
:after ox
:config
(setq org-re-reveal-root (expand-file-name "../../" (locate-library "dist/reveal.js" t))
(setq org-re-reveal-root (concat "file://" (expand-file-name "../../" (locate-library "dist/reveal.js" t)))
org-re-reveal-revealjs-version "4"))

4
modules/term/eshell/config.el
View file

@ -109,9 +109,7 @@ You should use `set-eshell-alias!' to change this.")
;; or configure `+eshell-aliases' via elisp.
(advice-add #'eshell-write-aliases-list :override #'ignore)
;; REVIEW In Emacs 27 and newer, waiting for esh-module is unnecessary.
(after! esh-module
(add-to-list 'eshell-modules-list 'eshell-tramp))
(add-to-list 'eshell-modules-list 'eshell-tramp)
;; Visual commands require a proper terminal. Eshell can't handle that, so
;; it delegates these commands to a term buffer.

11
modules/ui/emoji/README.org
View file

@ -4,9 +4,14 @@
#+since: 21.12.0
* Description :unfold:
This module gives Emacs the ability to display and insert emojis (ASCII, Github
style, or unicode styles), as well as convert certain text patterns (e.g.
=:smile:=) into emojis.
This module can redisplay ASCII/GitHub emoticon strings as corresponding Unicode
emoji. In addition, a completion command is provided to insert these strings as
well as the typical Unicode representations.
Note: Emacs 29 provides [[https://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS?h=emacs-29.1#n884][native support]] for inserting Unicode emojis. This module
only remains useful if you want ASCII/GitHub emoticon string
insertion/conversion or need PNG/ASCII emoji rendering on a system with limited
font configuration.
** Maintainers
*This module needs a maintainer.* [[doom-contrib-maintainer:][Become a maintainer?]]

4
modules/ui/popup/+hacks.el
View file

@ -148,7 +148,6 @@ the command buffer."
(advice-add #'evil-window-move-far-right :around #'+popup-save-a))
;;;###package help-mode
(after! help-mode
(defun +popup--switch-from-popup (location)
(let (origin enable-local-variables)
@ -254,7 +253,6 @@ the command buffer."
(apply fn args)))
;;;###package org
(after! org
(defadvice! +popup--suppress-delete-other-windows-a (fn &rest args)
"Org has a scorched-earth window management policy I'm not fond of. i.e. it
@ -344,7 +342,6 @@ Ugh, such an ugly hack."
(+popup--init window nil))))
;;;###package pdf-tools
(after! pdf-tools
(setq tablist-context-window-display-action
'((+popup-display-buffer-stacked-side-window-fn)
@ -382,7 +379,6 @@ Ugh, such an ugly hack."
(advice-add #'wgrep-finish-edit :after #'+popup-close-a))
;;;###package which-key
(after! which-key
(when (eq which-key-popup-type 'side-window)
(setq which-key-popup-type 'custom